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 891609fd0f589d22a689a88cc5a52d183bf80d4e..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,57 +22,8 @@ include_recipe "web::base"
 
 db_passwords = data_bag_item("db", "passwords")
 
 
 db_passwords = data_bag_item("db", "passwords")
 

-package "gcc"
-package "make"
-package "autoconf"
-package "automake"
-package "libfcgi-dev"
-package "libxml2-dev"
-package "libmemcached-dev"
-package "libboost-regex-dev"
-package "libboost-system-dev"
-package "libboost-program-options-dev"
-package "libboost-date-time-dev"
-package "libpqxx3-dev"
-package "zlib1g-dev"
-
-cgimap_directory = "#{node[:web][:base_directory]}/cgimap"
-pid_directory = node[:web][:pid_directory]
-log_directory = node[:web][:log_directory]
-
-execute "cgimap-build" do
-  action :nothing
-  command "make"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-end
-
-execute "cgimap-configure" do
-  action :nothing
-  command "./configure --with-fcgi=/usr --with-boost-libdir=/usr/lib/x86_64-linux-gnu"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-build]", :immediate
-end
-
-execute "cgimap-autogen" do
-  action :nothing
-  command "./autogen.sh"
-  cwd cgimap_directory
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-configure]", :immediate
-end
-
-git cgimap_directory do
-  action :sync
-  repository "git://git.openstreetmap.org/cgimap.git"
-  revision "live"
-  user "rails"
-  group "rails"
-  notifies :run, "execute[cgimap-autogen]", :immediate
+package "openstreetmap-cgimap-bin" do
+  action :upgrade

 end
 
 if node[:web][:readonly_database_host]
 end
 
 if node[:web][:readonly_database_host]


@@ -83,32 +34,36 @@ else
   database_readonly = node[:web][:status] == "database_readonly"
 end
 
   database_readonly = node[:web][:status] == "database_readonly"
 end
 

-cgimap_init = edit_file "#{cgimap_directory}/scripts/cgimap.init" do |line|
-  line.gsub!(/^CGIMAP_HOST=.*;/, "CGIMAP_HOST=#{database_host};")
-  line.gsub!(/^CGIMAP_DBNAME=.*;/, "CGIMAP_DBNAME=openstreetmap;")
-  line.gsub!(/^CGIMAP_USERNAME=.*;/, "CGIMAP_USERNAME=rails;")
-  line.gsub!(/^CGIMAP_PASSWORD=.*;/, "CGIMAP_PASSWORD=#{db_passwords['rails']};")
-  line.gsub!(/^CGIMAP_PIDFILE=.*;/, "CGIMAP_PIDFILE=#{pid_directory}/cgimap.pid;")
-  line.gsub!(/^CGIMAP_LOGFILE=.*;/, "CGIMAP_LOGFILE=#{log_directory}/cgimap.log;")
-  line.gsub!(/^CGIMAP_MEMCACHE=.*;/, "CGIMAP_MEMCACHE=rails1,rails2,rails3;")
-
-  line.gsub!(/\/home\/rails\/bin\/map/, "#{cgimap_directory}/map")
+memcached_servers = node[:web][:memcached_servers] || []

 
 

-  if database_readonly
-    line.gsub!(/--daemon/, "--daemon --readonly")
-  end
-
-  line
-end
+switches = database_readonly ? " --readonly" : ""

 
 

-file "/etc/init.d/cgimap" do
-  owner "root"
-  group "root"
-  mode 0755
-  content cgimap_init
+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
+  no_new_privileges true
+  restart "on-failure"
+  pid_file "#{node[:web][:pid_directory]}/cgimap.pid"

 end
 
 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


@@ -116,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, "execute[cgimap-build]"
-    subscribes :restart, "file[/etc/init.d/cgimap]"
+    subscribes :restart, "package[openstreetmap-cgimap-bin]"
+    subscribes :restart, "systemd_service[cgimap]"

   end
 end
   end
 end