add role for standalone nominatim server and apply to poldi

diff --git a/cookbooks/nominatim/recipes/standalone.rb b/cookbooks/nominatim/recipes/standalone.rb
new file mode 100644 (file)
index 0000000..f033c9f
--- /dev/null
+++ b/cookbooks/nominatim/recipes/standalone.rb
@@ -0,0 +1,47 @@
+#
+# Cookbook Name:: nominatim
+# Recipe:: standalone
+#
+# Copyright 2015, OpenStreetMap Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "git"
+
+database_cluster = node[:nominatim][:database][:cluster]
+home_directory = data_bag_item("accounts", "nominatim")["home"]
+
+git "#{home_directory}/nominatim" do
+  action :checkout
+  repository node[:nominatim][:repository]
+  enable_submodules true
+  user "nominatim"
+  group "nominatim"
+  notifies :run, "execute[compile_nominatim]"
+end
+
+include_recipe "nominatim::base"
+
+superusers = %w(tomh lonvia twain nominatim)
+
+superusers.each do |user|
+  postgresql_user user do
+    cluster database_cluster
+    superuser true
+  end
+end
+
+postgresql_user "www-data" do
+  cluster database_cluster
+end

diff --git a/roles/nominatim-standalone.rb b/roles/nominatim-standalone.rb
new file mode 100644 (file)
index 0000000..230225f
--- /dev/null
+++ b/roles/nominatim-standalone.rb
@@ -0,0 +1,17 @@
+name "nominatim-standalone"
+description "Role applied to all stand-alone nominatim servers"
+
+default_attributes(
+  :postgresql => {
+    :versions => ["9.3"]
+  },
+  :nominatim => {
+    :enable_backup => false
+  }
+
+)
+
+run_list(
+  "role[nominatim]",
+  "recipe[nominatim::standalone]"
+)

diff --git a/roles/poldi.rb b/roles/poldi.rb
index 1c180ab8aaea30229bb556963ebf10d5d4d55321..4782711600f521cb41b3a23a5e50d8f618654446 100644 (file)
--- a/roles/poldi.rb
+++ b/roles/poldi.rb
@@ -93,5 +93,5 @@ default_attributes(
 run_list(
   "role[ic]",
   "role[tyan-s7010]",
 run_list(
   "role[ic]",
   "role[tyan-s7010]",

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

 )
 )