Add osmblog-wp-theme to crm.osmfoundation.org

[chef.git] / roles / ironbelly.rb

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index cb807544d0ac9aa773fe6aa2097c9ba3f631f65b..34c03de71563680c5ddfe6fb23ce3a05e4d4b174 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -2,6 +2,15 @@ name "ironbelly"
 description "Master role applied to ironbelly"
 
 default_attributes(
 description "Master role applied to ironbelly"
 
 default_attributes(

+  :apt => {
+    :sources => [ "ubuntugis-unstable" ]
+  },
+  :git => {
+    :allowed_nodes => "*:*",
+    :user => "chefrepo",
+    :group => "chefrepo",
+    :backup => "chef-git"
+  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {


@@ -48,8 +57,8 @@ default_attributes(
         :gid => "tomh",
         :transfer_logging => false,
         :hosts_allow => [ 
         :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
         ]
       },
           "212.159.112.221"                      # grant
         ]
       },


@@ -63,13 +72,15 @@ default_attributes(
         :gid => "www-data",
         :transfer_logging => false,
         :hosts_allow => [
         :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
           "127.0.0.0/8",          # localhost
           "::1"                   # localhost
           "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"

       }
     }
   }
       }
     }
   }


@@ -83,6 +94,10 @@ run_list(
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",
   "role[web-storage]",
   "role[supybot]",
   "role[backup]",

+  "role[stats]",
+  "role[planet]",
+  "role[planetdump]",

   "recipe[rsyncd]",
   "recipe[rsyncd]",

-  "recipe[openvpn]"
+  "recipe[openvpn]",
+  "recipe[git::server]"

 )
 )