Remove roles for cherufe and shruikan

[chef.git] / roles / backup.rb

diff --git a/roles/backup.rb b/roles/backup.rb
index 1a9f1911bbd8b5ad4aa1246b7aa8d6f502b841b7..63ec1b1aae60ee421be78c1cc6afbd2ddc9a4c98 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 => {


@@ -19,16 +14,19 @@ default_attributes(
         :gid => "osmbackup",
         :transfer_logging => false,
         :hosts_allow => [
         :gid => "osmbackup",
         :transfer_logging => false,
         :hosts_allow => [

-          "128.40.168.0/24",                     # ucl external (wates)
-          "128.40.45.192/27",                    # ucl external (wolfson)
-          "146.179.159.160/27",                  # ic internal
-          "193.63.75.96/27",                     # ic external
-          "2001:630:12:500::/64",                # ic external
+          "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.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.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
         ]