Use an EnvironmentFile for cgimap to better protect passwords

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index 231915b149cf9d16dd2a31713a7cf308b1deadd5..1a72d0363f0020d5f8ab9a55fca5ab9ee8b10917 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -34,19 +34,30 @@ end
 
 memcached_servers = node[:web][:memcached_servers] || []
 
 
 memcached_servers = node[:web][:memcached_servers] || []
 

-template "/etc/init.d/cgimap" do
-  owner "root"
-  group "root"
-  mode 0o755
-  source "cgimap.init.erb"
-  variables(
-    :db_password => db_passwords["rails"],
-    :pid_directory => node[:web][:pid_directory],
-    :log_directory => node[:web][:log_directory],
-    :database_host => database_host,
-    :database_readonly => database_readonly,
-    :memcached_servers => memcached_servers
-  )
+switches = database_readonly ? " --readonly" : ""
+
+systemd_service "cgimap" do
+  description "OpenStreetMap API Server"
+  type "forking"
+  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}"
+  exec_reload "/bin/kill -HUP $MAINPID"
+  private_tmp true
+  private_devices true
+  protect_system "full"
+  protect_home true
+  restart "on-failure"
+  pid_file "#{node[:web][:pid_directory]}/cgimap.pid"

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


@@ -58,6 +69,6 @@ else
     action [:enable, :start]
     supports :restart => true, :reload => true
     subscribes :restart, "dpkg_package[openstreetmap-cgimap-bin]"
     action [:enable, :start]
     supports :restart => true, :reload => true
     subscribes :restart, "dpkg_package[openstreetmap-cgimap-bin]"

-    subscribes :restart, "file[/etc/init.d/cgimap]"
+    subscribes :restart, "systemd_service[cgimap]"

   end
 end
   end
 end