Use apache 2.4 style access controls

[chef.git] / roles / horntail.rb

diff --git a/roles/horntail.rb b/roles/horntail.rb
index 19003a53c815397d2fb324f38e4ad75c5b7d3fcb..3c7292596f96250e62635b36d9c870291b53a416 100644 (file)
--- a/roles/horntail.rb
+++ b/roles/horntail.rb
@@ -65,18 +65,6 @@ default_attributes(
       }
     }
   },
-  :openvpn => {
-    :address => "10.0.16.2",
-    :tunnels => {
-      :ic2ucl => {
-        :port => "1194",
-        :mode => "server",
-        :peer => {
-          :host => "ridley.openstreetmap.org"
-        }
-      }
-    }
-  },
   :rsyncd => {
     :modules => {
       :hosts => {
@@ -89,8 +77,8 @@ default_attributes(
         :gid => "tomh",
         :transfer_logging => false,
         :hosts_allow => [ 
-          "89.16.179.150",                       # shenron
-          "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron
+          "212.110.172.32",                      # shenron
+          "2001:41c9:1:400::32",                 # shenron
           "212.159.112.221"                      # grant
         ]
       },
@@ -104,7 +92,8 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
-          "128.40.168.0/24",      # ucl external
+          "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
@@ -117,15 +106,5 @@ default_attributes(
 );
 
 run_list(
-  "role[ic]",
-  "role[gateway]",
-  "role[chef-server]",
-  "role[chef-repository]",
-  "role[planet]",
-  "role[stats]",
-  "role[web-storage]",
-  "role[backup]",
-  "role[supybot]",
-  "recipe[rsyncd]",
-  "recipe[openvpn]"
+  "role[ic]"
 )