Add new Equinix addresses to Dublin hosts

[chef.git] / roles / backup.rb

diff --git a/roles/backup.rb b/roles/backup.rb
index b0c519bd8f3c3f1e0ac2c0cc893b55a967b5ee16..5cbec26d65e741d419d7d97f9975fa1cfde497dc 100644 (file)
--- a/roles/backup.rb
+++ b/roles/backup.rb
@@ -2,11 +2,6 @@ name "backup"
 description "Role applied to backup.openstreetmap.org"
 
 default_attributes(
 description "Role applied to backup.openstreetmap.org"
 
 default_attributes(

-  :accounts => {
-    :users => {
-      :osmbackup => { :status => :role }
-    }
-  },

   :rsyncd => {
     :modules => {
       :backup => {
   :rsyncd => {
     :modules => {
       :backup => {


@@ -20,21 +15,56 @@ default_attributes(
         :transfer_logging => false,
         :hosts_allow => [
           "193.60.236.0/24",                     # ucl external
         :transfer_logging => false,
         :hosts_allow => [
           "193.60.236.0/24",                     # ucl external

-          "10.0.48.0/20",                        # equinix internal
-          "130.117.76.0/27",                     # equinix external
-          "2001:978:2:2C::172:0/112",            # equinix external
+          "10.0.48.0/20",                        # amsterdam internal
+          "184.104.179.128/27",                  # amsterdam external (he.net)
+          "2001:470:1:fa1::/64",                 # amsterdam external (he.net)
+          "82.199.86.96/27",                     # amsterdam external (equinix)
+          "2001:4d78:500:5e3::/64",              # amsterdam external (equinix)
+          "10.0.64.0/20",                        # dublin internal
+          "184.104.226.96/27",                   # dublin external (he.net)
+          "2001:470:1:b3b::/64",                 # dublin external (he.net)
+          "87.252.214.96/27",                    # dublin external (equinix)
+          "2001:4d78:fe03:1c::/64",              # dublin external (equinix)

           "10.0.32.0/20",                        # bytemark internal
           "89.16.162.16/28",                     # bytemark external
           "2001:41c9:2:d6::/64",                 # bytemark external
           "212.110.172.32",                      # shenron
           "2001:41c9:1:400::32",                 # shenron
           "10.0.32.0/20",                        # bytemark internal
           "89.16.162.16/28",                     # bytemark external
           "2001:41c9:2:d6::/64",                 # bytemark external
           "212.110.172.32",                      # shenron
           "2001:41c9:1:400::32",                 # shenron

-          "140.211.167.104",                     # osuosl
-          "140.211.167.105",                     # osuosl
-          "2605:bc80:3010:700::8cde:a768",       # osuosl
-          "2605:bc80:3010:700::8cde:a769",       # osuosl
+          "140.211.167.99",                      # osuosl
+          "140.211.167.100",                     # osuosl
+          "2605:bc80:3010:700::8cd3:a763",       # osuosl
+          "2605:bc80:3010:700::8cd3:a764",       # osuosl

           "127.0.0.0/8",                         # localhost
           "::1"                                  # localhost
         ]
           "127.0.0.0/8",                         # localhost
           "::1"                                  # localhost
         ]

+      },
+      :logs => {
+        :comment => "Log files",
+        :path => "/store/logs",
+        :read_only => false,
+        :write_only => true,
+        :list => false,
+        :uid => "osmbackup",
+        :gid => "osmbackup",
+        :transfer_logging => false,
+        :hosts_allow => [
+          "193.60.236.0/24",          # ucl external
+          "10.0.48.0/20",             # amsterdam internal
+          "184.104.179.128/27",       # amsterdam external (he.net)
+          "2001:470:1:fa1::/64",      # amsterdam external (he.net)
+          "82.199.86.96/27",          # amsterdam external (equinix)
+          "2001:4d78:500:5e3::/64",   # amsterdam external (equinix)
+          "10.0.64.0/20",             # dublin internal
+          "184.104.226.96/27",        # dublin external (he.net)
+          "2001:470:1:b3b::/64",      # dublin external (he.net)
+          "87.252.214.96/27",         # dublin external (equinix)
+          "2001:4d78:fe03:1c::/64",   # dublin external (equinix)
+          "10.0.32.0/20",             # bytemark internal
+          "89.16.162.16/28",          # bytemark external
+          "2001:41c9:2:d6::/64",      # bytemark external
+          "127.0.0.0/8",              # localhost
+          "::1"                       # localhost
+        ]

       }
     }
   }
       }
     }
   }