Allow all tilecache servers to sync to the log store

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 252848d30561618bce30dbb92122275bc8166313..427e9ce9cdf18bdeaed961825989e97227d757e2 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,6 +2,9 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
+  :apt => {
+    :sources => [ "ubuntugis-unstable" ]
+  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
@@ -23,9 +26,69 @@ default_attributes(
         :address => "2001:630:12:500:225:90ff:fec4:f6ef"
       }
     }
+  },
+  :openvpn => {
+    :address => "10.0.16.2",
+    :tunnels => {
+      :ic2ucl => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }
+      }
+    }
+  },
+  :rsyncd => {
+    :modules => {
+      :hosts => {
+        :comment => "Host data",
+        :path => "/home/hosts",
+        :read_only => true,
+        :write_only => false,
+        :list => false,
+        :uid => "tomh",
+        :gid => "tomh",
+        :transfer_logging => false,
+        :hosts_allow => [ 
+          "89.16.179.150",                       # shenron
+          "2001:41c8:10:996:21d:7dff:fec3:df70", # shenron
+          "212.159.112.221"                      # grant
+        ]
+      },
+      :logs => {
+        :comment => "Log files",
+        :path => "/store/logs",
+        :read_only => false,
+        :write_only => true,
+        :list => false,
+        :uid => "www-data",
+        :gid => "www-data",
+        :transfer_logging => false,
+        :hosts_allow => [
+          "128.40.168.0/24",      # ucl external
+          "146.179.159.160/27",   # ic internal
+          "193.63.75.96/27",      # ic external
+          "2001:630:12:500::/64", # ic external
+          "127.0.0.0/8",          # localhost
+          "::1"                   # localhost
+        ],
+        :nodes_allow => "roles:tilecache"
+      }
+    }
   }
 );
 
 run_list(
-  "role[ic]"
+  "role[ic]",
+  "role[gateway]",
+  "role[chef-server]",
+  "role[chef-repository]",
+  "role[web-storage]",
+  "role[supybot]",
+  "role[backup]",
+  "role[stats]",
+  "role[planet]",
+  "recipe[rsyncd]",
+  "recipe[openvpn]"
 )