Bump kitchen-dokken from 2.10.0 to 2.11.0

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

diff --git a/cookbooks/web/recipes/cgimap.rb b/cookbooks/web/recipes/cgimap.rb
index d2dbb7a3b639e06876039d4b5d2d2814774aa5cc..8a6b23b2878390818d7555248afe40d29c433bc8 100644 (file)
--- a/cookbooks/web/recipes/cgimap.rb
+++ b/cookbooks/web/recipes/cgimap.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: cgimap
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt"

 include_recipe "tools"
 include_recipe "web::base"
 
 include_recipe "tools"
 include_recipe "web::base"
 


@@ -26,18 +27,14 @@ package "openstreetmap-cgimap-bin" do
   action :upgrade
 end
 
   action :upgrade
 end
 

-if node[:web][:readonly_database_host]
-  database_host = node[:web][:readonly_database_host]
-  database_readonly = node[:web][:readonly_database_host] != node[:web][:database_host]
-else
-  database_host = node[:web][:database_host]
-  database_readonly = node[:web][:status] == "database_readonly"
-end
+database_host = if node[:web][:readonly_database_host]
+                  node[:web][:readonly_database_host]
+                else
+                  node[:web][:database_host]
+                end

 
 memcached_servers = node[:web][:memcached_servers] || []
 
 
 memcached_servers = node[:web][:memcached_servers] || []
 

-switches = database_readonly ? " --readonly" : ""
-

 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"
 systemd_service "cgimap" do
   description "OpenStreetMap API Server"
   type "forking"


@@ -53,7 +50,7 @@ systemd_service "cgimap" do
                    "CGIMAP_RATELIMIT" => "204800",
                    "CGIMAP_MAXDEBT" => "250"
   user "rails"
                    "CGIMAP_RATELIMIT" => "204800",
                    "CGIMAP_MAXDEBT" => "250"
   user "rails"

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

   exec_reload "/bin/kill -HUP $MAINPID"
   private_tmp true
   private_devices true
   exec_reload "/bin/kill -HUP $MAINPID"
   private_tmp true
   private_devices true