X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b48d93e7fb488da12eaac4b747d0cb9b41a72328..b52a55582446c7639f6727db470a9ba4d6ba7c1b:/cookbooks/planet/recipes/replication.rb

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 28ca79a33..feedac7da 100644
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.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
 #
-#     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,
@@ -21,68 +21,99 @@ include_recipe "osmosis"
 
 db_passwords = data_bag_item("db", "passwords")
 
+package "postgresql-client"
+
 package "ruby"
-package "rubygems"
+package "ruby-dev"
 package "ruby-libxml"
 
 package "libpq-dev"
 gem_package "pg"
 
+package "make"
+package "gcc"
+
+remote_directory "/opt/flush" do
+  source "flush"
+  owner "root"
+  group "root"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755
+end
+
+execute "/opt/flush/Makefile" do
+  action :nothing
+  command "make"
+  cwd "/opt/flush"
+  user "root"
+  group "root"
+  subscribes :run, "remote_directory[/opt/flush]"
+end
+
 remote_directory "/usr/local/bin" do
   source "replication-bin"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
+end
+
+template "/usr/local/bin/users-agreed" do
+  source "users-agreed.erb"
+  owner "root"
+  group "root"
+  mode 0o755
 end
 
 remote_directory "/store/planet/replication" do
   source "replication-cgi"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0755
+  files_mode 0o755
 end
 
 directory "/store/planet/replication/changesets" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/store/planet/replication/day" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/store/planet/replication/hour" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/store/planet/replication/minute" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/etc/replication" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/replication/auth.conf" do
   source "replication.auth.erb"
   user "root"
   group "planet"
-  mode 0640
+  mode 0o640
   variables :password => db_passwords["planetdiff"]
 end
 
@@ -90,35 +121,35 @@ template "/etc/replication/changesets.conf" do
   source "changesets.conf.erb"
   user "root"
   group "planet"
-  mode 0640
+  mode 0o640
   variables :password => db_passwords["planetdiff"]
 end
 
 template "/etc/replication/users-agreed.conf" do
   source "users-agreed.conf.erb"
-  user "root"
+  user "planet"
   group "planet"
-  mode 0640
+  mode 0o600
   variables :password => db_passwords["planetdiff"]
 end
 
 directory "/var/lib/replication" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 directory "/var/lib/replication/hour" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 template "/var/lib/replication/hour/configuration.txt" do
   source "replication.config.erb"
   owner "planet"
   group "planet"
-  mode 0644
+  mode 0o644
   variables :base => "minute", :interval => 3600
 end
 
@@ -129,14 +160,14 @@ end
 directory "/var/lib/replication/day" do
   owner "planet"
   group "planet"
-  mode 0755
+  mode 0o755
 end
 
 template "/var/lib/replication/day/configuration.txt" do
   source "replication.config.erb"
   owner "planet"
   group "planet"
-  mode 0644
+  mode 0o644
   variables :base => "hour", :interval => 86400
 end
 
@@ -144,37 +175,50 @@ link "/var/lib/replication/day/data" do
   to "/store/planet/replication/day"
 end
 
-template "/etc/cron.d/replication" do
-  source "replication.cron.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
-
-directory "/var/lib/replication/streaming" do
-  owner "planet"
-  group "planet"
-  mode 0755
-end
-
-directory "/var/log/replication" do
-  owner "planet"
-  group "planet"
-  mode 0755
-end
-
-[ "streaming-replicator", "streaming-server" ].each do |name|
-  template "/etc/init.d/#{name}" do
-    source "streaming.init.erb"
+if node[:planet][:replication] == "enabled"
+  template "/etc/cron.d/replication" do
+    source "replication.cron.erb"
     owner "root"
     group "root"
-    mode 0755
-    variables :service => name
+    mode 0o644
   end
-
-  service name do
-    action [ :enable, :start ]
-    supports :restart => true, :status => true
-    subscribes :restart, "template[/etc/init.d/#{name}]"
+else
+  file "/etc/cron.d/replication" do
+    action :delete
   end
 end
+
+# directory "/var/lib/replication/streaming" do
+#   owner "planet"
+#   group "planet"
+#   mode 0o755
+# end
+#
+# directory "/var/log/replication" do
+#   owner "planet"
+#   group "planet"
+#   mode 0o755
+# end
+#
+# ["streaming-replicator", "streaming-server"].each do |name|
+#   template "/etc/init.d/#{name}" do
+#     source "streaming.init.erb"
+#     owner "root"
+#     group "root"
+#     mode 0o755
+#     variables :service => name
+#   end
+#
+#   if node[:planet][:replication] == "enabled"
+#     service name do
+#       action [:enable, :start]
+#       supports :restart => true, :status => true
+#       subscribes :restart, "template[/etc/init.d/#{name}]"
+#     end
+#   else
+#     service name do
+#       action [:disable, :stop]
+#       supports :restart => true, :status => true
+#     end
+#   end
+# end