nominatim: fix string format for state

[chef.git] / cookbooks / web / recipes / cgimap.rb

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index d2966e1beff0deab83d7052c14d18017570c13e2..e8f8171199eb0569700f331ecf96f280ea74e9f6 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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
+#     https://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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -22,7 +22,9 @@ include_recipe "web::base"
 
 db_passwords = data_bag_item("db", "passwords")
 
 
 db_passwords = data_bag_item("db", "passwords")
 

-package "openstreetmap-cgimap-bin"
+package "openstreetmap-cgimap-bin" do
+  action :upgrade
+end

 
 if node[:web][:readonly_database_host]
   database_host = node[:web][:readonly_database_host]
 
 if node[:web][:readonly_database_host]
   database_host = node[:web][:readonly_database_host]


@@ -39,27 +41,29 @@ switches = database_readonly ? " --readonly" : ""
 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"
 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"

-  environment "CGIMAP_HOST" => database_host,
-              "CGIMAP_DBNAME" => "openstreetmap",
-              "CGIMAP_USERNAME" => "rails",
-              "CGIMAP_PASSWORD" => db_passwords["rails"],
-              "CGIMAP_OAUTH_HOST" => node[:web][:database_host],
-              "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid",
-              "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log",
-              "CGIMAP_MEMCACHE" => memcached_servers.join(","),
-              "CGIMAP_RATELIMIT" => "204800",
-              "CGIMAP_MAXDEBT" => "250"
+  environment_file "CGIMAP_HOST" => database_host,
+                   "CGIMAP_DBNAME" => "openstreetmap",
+                   "CGIMAP_USERNAME" => "rails",
+                   "CGIMAP_PASSWORD" => db_passwords["rails"],
+                   "CGIMAP_OAUTH_HOST" => node[:web][:database_host],
+                   "CGIMAP_PIDFILE" => "#{node[:web][:pid_directory]}/cgimap.pid",
+                   "CGIMAP_LOGFILE" => "#{node[:web][:log_directory]}/cgimap.log",
+                   "CGIMAP_MEMCACHE" => memcached_servers.join(","),
+                   "CGIMAP_RATELIMIT" => "204800",
+                   "CGIMAP_MAXDEBT" => "250"

   user "rails"
   exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30#{switches}"
   user "rails"
   exec_start "/usr/bin/openstreetmap-cgimap --daemon --port 8000 --instances 30#{switches}"

+  exec_reload "/bin/kill -HUP $MAINPID"

   private_tmp true
   private_devices true
   protect_system "full"
   protect_home true
   private_tmp true
   private_devices true
   protect_system "full"
   protect_home true

+  no_new_privileges true

   restart "on-failure"
   pid_file "#{node[:web][:pid_directory]}/cgimap.pid"
 end
 
   restart "on-failure"
   pid_file "#{node[:web][:pid_directory]}/cgimap.pid"
 end
 

-if %w(database_offline api_offline).include?(node[:web][:status])
+if %w[database_offline api_offline].include?(node[:web][:status])

   service "cgimap" do
     action :stop
   end
   service "cgimap" do
     action :stop
   end


@@ -67,7 +71,7 @@ else
   service "cgimap" do
     action [:enable, :start]
     supports :restart => true, :reload => true
   service "cgimap" do
     action [:enable, :start]
     supports :restart => true, :reload => true

-    subscribes :restart, "dpkg_package[openstreetmap-cgimap-bin]"
+    subscribes :restart, "package[openstreetmap-cgimap-bin]"

     subscribes :restart, "systemd_service[cgimap]"
   end
 end
     subscribes :restart, "systemd_service[cgimap]"
   end
 end