TEMPORARY unblock of osmdroid-based apps which should be setting their unique User...

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index cc6a278e49e4af554f0a09a343ca7729c77cbb35..7fc730a3156dd4959bca8832cb7c1e300162afbf 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -40,66 +40,58 @@ default_attributes(
         :interface => "eth0",
         :role => :internal,
         :family => :inet,
         :interface => "eth0",
         :role => :internal,
         :family => :inet,

-        :address => "10.0.0.16"
+        :address => "146.179.159.164"

       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,

-        :address => "128.40.45.203"
+        :address => "193.63.75.101"
+      },
+      :external_ipv6 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:630:12:500:2e0:81ff:fec5:333e"

       }
     }
   },
   :postgresql => {
       }
     }
   },
   :postgresql => {

-    :versions => [ "9.3" ],
+    :versions => ["9.3"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :shared_buffers => "10GB",

         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",

-        :effective_cache_size => "48GB",
+        :effective_cache_size => "40GB",

         :fsync => "on"
       }
     }
   },
   :nominatim => {
         :fsync => "on"
       }
     }
   },
   :nominatim => {

-    :enabled => false,

     :flatnode_file => "/ssd-old/nominatim/nodes.store",
     :database => {
     :flatnode_file => "/ssd-old/nominatim/nodes.store",
     :database => {

-        :cluster => "9.3/main",
-        :dbname => "nominatim",
-        :postgis => "2.1"
+      :cluster => "9.3/main",
+      :dbname => "nominatim",
+      :postgis => "2.1"

     },
     :fpm_pools => {
     },
     :fpm_pools => {

-        :www => {
-            :port => "8000",
-            :pm => "dynamic",
-            :max_children => "60"
-        },
-        :bulk => {
-            :port => "8001",
-            :pm => "static",
-            :max_children => "10"
-        }
-    },
-    :tablespaces => {
-        "Osm2pgsql_Data" => "aux",
-        "Osm2pgsql_Index" => "data",
-        "Place_Data" => "ssd2",
-        "Place_Index" => "ssd1",
-        "Address_Data" => "ssd2",
-        "Address_Index" => "ssd1",
-        "Search_Data" => "ssd1",
-        "Search_Index" => "ssd1",
-        "Aux_Data" => "aux",
-        "Aux_Index" => "aux",
+      :www => {
+        :port => "8000",
+        :pm => "dynamic",
+        :max_children => "60"
+      },
+      :bulk => {
+        :port => "8001",
+        :pm => "static",
+        :max_children => "10"
+      }

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

-  "role[ucl-wolfson]",
+  "role[ic]",

   "role[tyan-s7010]",
   "role[tyan-s7010]",

-  "role[nominatim]"
+  "role[nominatim-standalone]"

 )
 )