Update formatting of header comments

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

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index b20cf7c656729265d7c473a69b89d69b66b04b60..548ae871bdf920d20b8c99d9db5814951b529090 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: planet
+# Cookbook:: planet

 # Recipe:: dump
 #
 # Recipe:: dump
 #

-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,6 +30,28 @@ 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"
 remote_directory "/usr/local/bin" do
   source "replication-bin"
   owner "root"


@@ -47,6 +69,23 @@ template "/usr/local/bin/users-agreed" do
   mode 0o755
 end
 
   mode 0o755
 end
 

+template "/usr/local/bin/users-deleted" do
+  source "users-deleted.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+remote_directory "/store/planet/users_deleted" do
+  source "users_deleted"
+  owner "planet"
+  group "planet"
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o644
+end
+

 remote_directory "/store/planet/replication" do
   source "replication-cgi"
   owner "root"
 remote_directory "/store/planet/replication" do
   source "replication-cgi"
   owner "root"


@@ -166,37 +205,37 @@ else
   end
 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
+# 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