Revert "remove redirect of reverse to poldi"

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 0f5b6c8b1a07d2896e8a4032499b79335152dd15..6d2babbbcd851c6fe9e25ac3ee7415329122e617 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -40,18 +40,23 @@ 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"],

     :settings => {
       :defaults => {
         :shared_buffers => "10GB",
     :settings => {
       :defaults => {
         :shared_buffers => "10GB",


@@ -64,7 +69,6 @@ default_attributes(
     }
   },
   :nominatim => {
     }
   },
   :nominatim => {

-    :enabled => false,

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


@@ -82,24 +86,12 @@ default_attributes(
         :pm => "static",
         :max_children => "10"
       }
         :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"

     }
   }
 )
 
 run_list(
     }
   }
 )
 
 run_list(

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

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

-  "role[nominatim]"
+  "role[nominatim-slave]"

 )
 )