Don't try and restart passenger on machines that don't have it

[chef.git] / cookbooks / planet / recipes / replication.rb

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index fef4e017ed51235b09ff1228b2e9a12a578649db..feedac7dab59fd41f2f092e771a2b2378ea2f360 100644 (file)
--- 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
 #
 # 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,


@@ -30,61 +30,90 @@ package "ruby-libxml"
 package "libpq-dev"
 gem_package "pg"
 
 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"
 remote_directory "/usr/local/bin" do
   source "replication-bin"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

   files_owner "root"
   files_group "root"
   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"
 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_owner "root"
   files_group "root"

-  files_mode 0755
+  files_mode 0o755

 end
 
 directory "/store/planet/replication/changesets" do
   owner "planet"
   group "planet"
 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"
 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"
 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"
 end
 
 directory "/store/planet/replication/minute" do
   owner "planet"
   group "planet"

-  mode 0755
+  mode 0o755

 end
 
 directory "/etc/replication" do
   owner "root"
   group "root"
 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"
 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
 
   variables :password => db_passwords["planetdiff"]
 end
 


@@ -92,7 +121,7 @@ template "/etc/replication/changesets.conf" do
   source "changesets.conf.erb"
   user "root"
   group "planet"
   source "changesets.conf.erb"
   user "root"
   group "planet"

-  mode 0640
+  mode 0o640

   variables :password => db_passwords["planetdiff"]
 end
 
   variables :password => db_passwords["planetdiff"]
 end
 


@@ -100,27 +129,27 @@ template "/etc/replication/users-agreed.conf" do
   source "users-agreed.conf.erb"
   user "planet"
   group "planet"
   source "users-agreed.conf.erb"
   user "planet"
   group "planet"

-  mode 0600
+  mode 0o600

   variables :password => db_passwords["planetdiff"]
 end
 
 directory "/var/lib/replication" do
   owner "planet"
   group "planet"
   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"
 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"
 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
 
   variables :base => "minute", :interval => 3600
 end
 


@@ -131,14 +160,14 @@ end
 directory "/var/lib/replication/day" do
   owner "planet"
   group "planet"
 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"
 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
 
   variables :base => "hour", :interval => 86400
 end
 


@@ -151,7 +180,7 @@ if node[:planet][:replication] == "enabled"
     source "replication.cron.erb"
     owner "root"
     group "root"
     source "replication.cron.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

   end
 else
   file "/etc/cron.d/replication" do
   end
 else
   file "/etc/cron.d/replication" do


@@ -159,37 +188,37 @@ else
   end
 end
 
   end
 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"
-    owner "root"
-    group "root"
-    mode 0755
-    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
+# 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