Add test for serverinfo cookbook

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 1a72d0363f0020d5f8ab9a55fca5ab9ee8b10917..ba9799c4c7685e91c6d253fd5da73f992d0c0409 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: web
+# Cookbook:: web
 # Recipe:: cgimap
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, 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
+#     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,
@@ -17,12 +17,15 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
 include_recipe "tools"
 include_recipe "web::base"
 
 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]
@@ -41,9 +44,10 @@ systemd_service "cgimap" do
   type "forking"
   environment_file "CGIMAP_HOST" => database_host,
                    "CGIMAP_DBNAME" => "openstreetmap",
-                   "CGIMAP_USERNAME" => "rails",
-                   "CGIMAP_PASSWORD" => db_passwords["rails"],
+                   "CGIMAP_USERNAME" => "cgimap",
+                   "CGIMAP_PASSWORD" => db_passwords["cgimap"],
                    "CGIMAP_OAUTH_HOST" => node[:web][:database_host],
+                   "CGIMAP_UPDATE_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(","),
@@ -56,11 +60,12 @@ systemd_service "cgimap" do
   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
 
-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
@@ -68,7 +73,7 @@ else
   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