nominatim: UI forwarding should take precedence to blocking

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
deleted file mode 100644 (file)
index 5d46471..0000000
--- a/roles/pummelzacken.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-name "pummelzacken"
-description "Master role applied to pummelzacken"
-
-default_attributes(
-  :networking => {
-    :interfaces => {
-      :internal_ipv4 => {
-        :interface => "em1",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.20"
-      },
-      :external_ipv4 => {
-        :interface => "em2",
-        :role => :external,
-        :family => :inet,
-        :address => "128.40.45.204"
-      }
-    }
-  },
-  :postgresql => {
-    :settings => {
-      :defaults => {
-        :listen_addresses => "10.0.0.20",
-        :shared_buffers => "10GB",
-        :work_mem => "160MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
-      }
-    }
-  },
-  :nominatim => {
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :database => {
-      :cluster => "9.3/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
-      }
-    },
-    :redirects => {
-      :reverse => "poldi.openstreetmap.org"
-    }
-  }
-)
-
-run_list(
-  "role[ucl-wolfson]",
-  "role[nominatim-master]"
-)