tilecache: reject request without user-agent (try2)

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index 37511e2f26079b61d77735c7740ce242c997fc08..be3a48e3f3954443c5a7b5cb6493a9524514a29c 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -2,38 +2,69 @@ name "grisu"
 description "Master role applied to grisu"
 
 default_attributes(
 description "Master role applied to grisu"
 
 default_attributes(

-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator }
-    }
-  },

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

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.32.20",
+        :bond => {
+          :slaves => %w[em1 em2]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth0",
+        :interface => "bond0.214",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "142.4.213.166",
-        :prefix => "24",
-        :gateway => "142.4.213.254"
+        :address => "89.16.162.20"

       },
       :external_ipv6 => {
       },
       :external_ipv6 => {

-        :interface => "eth0",
+        :interface => "bond0.214",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2607:5300:60:12a6::1",
-        :prefix => "64",
-        :gateway => "2607:5300:60:12ff:ff:ff:ff:ff"
+        :address => "2001:41c9:2:d6::20"
+      }
+    }
+  },
+  :openvpn => {
+    :address => "10.0.16.5",
+    :tunnels => {
+      :ic2bm => {
+        :port => "1194",
+        :mode => "server",
+        :peer => {
+          :host => "ironbelly.openstreetmap.org"
+        }
+      },
+      :aws2bm => {
+        :port => "1195",
+        :mode => "server",
+        :peer => {
+          :host => "fafnir.openstreetmap.org"
+        }
+      },
+      :ucl2bm => {
+        :port => "1196",
+        :mode => "server",
+        :peer => {
+          :host => "ridley.openstreetmap.org"
+        }

       }
     }
   },
       }
     }
   },

-  :squid => {
-    :cache_mem => "9000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
+  :planet => {
+    :replication => "disabled"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ovh-ca]",
-  "role[tilecache]"
+  "role[bytemark]",
+  "role[hp-dl180-g6]",
+  "role[gateway]",
+  "role[web-storage]",
+  "role[backup]",
+  "role[planet]",
+  # "role[planetdump]",
+  "recipe[openvpn]"

 )
 )