Set server_protocol to https for all rails port instances

[chef.git] / roles / poldi.rb

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 127a5265b0d9fade6e5211a4302f61698efcd858..379e35f20f383070490fdfc1fc7dd19723cbe17c 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -40,66 +40,25 @@ default_attributes(
         :interface => "eth0",
         :role => :internal,
         :family => :inet,
-        :address => "10.0.0.16"
+        :address => "146.179.159.164"
       },
       :external_ipv4 => {
         :interface => "eth1",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.203"
-      }
-    }
-  },
-  :postgresql => {
-    :versions => [ "9.3" ],
-    :settings => {
-      :defaults => {
-        :shared_buffers => "10GB",
-        :work_mem => "160MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "48GB",
-        :fsync => "on"
-      }
-    }
-  },
-  :nominatim => {
-    :enabled => false,
-    :flatnode_file => "/ssd-old/nominatim/nodes.store",
-    :database => {
-      :cluster => "9.3/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
+        :address => "193.63.75.101"
       },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
+      :external_ipv6 => {
+        :interface => "eth1",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:630:12:500:2e0:81ff:fec5:333e"
       }
-    },
-    :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(
-  "role[ucl-wolfson]",
-  "role[tyan-s7010]",
-  "role[nominatim]"
+  "role[ic]",
+  "role[tyan-s7010]"
 )