Explicitly set number of osm2pgsql processes

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 9f264a1bf7094a75909293515ef60209773846f9..9d16f3b7cfd38d6b2201cf6a54e0e558b5cb27f3 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -2,6 +2,15 @@ name "viserion"
 description "Master role applied to viserion"
 
 default_attributes(
 description "Master role applied to viserion"
 
 default_attributes(

+  :accounts => {
+    :users => {
+      :anovak => { :status => :administrator }
+    }
+  },
+  :location => "Pula, Croatia",
+  :munin => {
+    :allow => ["193.198.233.210"]
+  },

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


@@ -16,11 +25,17 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
         :interface => "eth0",
         :role => :external,
         :family => :inet6,

-        :address => "2001:b68:4cff:3::2",
-        :prefix => "128",
-        :gateway => "fe80::217:fff:fead:14c0"
+        :address => "2001:b68:4cff:3::3",
+        :prefix => "64",
+        :gateway => "2001:b68:4cff:3::1"

       }
       }

-    }
+    },
+    :nameservers => [
+      "161.53.2.66",
+      "2001:b68:ff:1::2",
+      "2001:b68:ff:2::2",
+      "2001:4860:4860::8888"
+    ]

   },
   :squid => {
     :cache_mem => "12500 MB",
   },
   :squid => {
     :cache_mem => "12500 MB",


@@ -29,10 +44,12 @@ default_attributes(
   :tilecache => {
     :tile_parent => "pula.render.openstreetmap.org",
     :tile_siblings => [
   :tilecache => {
     :tile_parent => "pula.render.openstreetmap.org",
     :tile_siblings => [

+      "drogon.openstreetmap.org"

     ]
   }
 )
 
 run_list(
     ]
   }
 )
 
 run_list(

-  "role[carnet]"
+  "role[carnet]",
+  "role[tilecache]"

 )
 )