Merge remote-tracking branch 'github/pull/621'

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

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index 7bd11aecef88497339137e48e5dddb376a6656ca..6cc509c62c5bdb979d5fb8e5a9ab421dfc0d43f6 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "git"
 
 package %w[
 include_recipe "git"
 
 package %w[


@@ -54,7 +55,7 @@ end
 git "/opt/planet-dump-ng" do
   action :sync
   repository "https://github.com/zerebubuth/planet-dump-ng.git"
 git "/opt/planet-dump-ng" do
   action :sync
   repository "https://github.com/zerebubuth/planet-dump-ng.git"

-  revision "v1.2.6"
+  revision "v1.2.7"

   depth 1
   user "root"
   group "root"
   depth 1
   user "root"
   group "root"


@@ -88,13 +89,13 @@ execute "/opt/planet-dump-ng/Makefile" do
 end
 
 directory "/store/planetdump" do
 end
 
 directory "/store/planetdump" do

-  owner "www-data"
-  group "www-data"
+  owner "planet"
+  group "planet"

   mode "755"
   recursive true
 end
 
   mode "755"
   recursive true
 end
 

-%w[planetdump planet-mirror-redirect-update].each do |program|
+%w[planetdump planetdump-trigger planet-mirror-redirect-update].each do |program|

   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"
   template "/usr/local/bin/#{program}" do
     source "#{program}.erb"
     owner "root"


@@ -105,7 +106,7 @@ end
 
 systemd_service "planetdump@" do
   description "Planet dump for %i"
 
 systemd_service "planetdump@" do
   description "Planet dump for %i"

-  user "www-data"
+  user "planet"

   exec_start "/usr/local/bin/planetdump %i"
   memory_max "64G"
   sandbox true
   exec_start "/usr/local/bin/planetdump %i"
   memory_max "64G"
   sandbox true


@@ -128,12 +129,13 @@ end
 
 service "planetdump-trigger" do
   action [:enable, :start]
 
 service "planetdump-trigger" do
   action [:enable, :start]

+  subscribes :restart, "template[/usr/local/bin/planetdump-trigger]"

 end
 
 systemd_service "planet-dump-mirror" do
   description "Update planet dump mirrors"
   exec_start "/usr/local/bin/planet-mirror-redirect-update"
 end
 
 systemd_service "planet-dump-mirror" do
   description "Update planet dump mirrors"
   exec_start "/usr/local/bin/planet-mirror-redirect-update"

-  user "www-data"
+  user "planet"

   sandbox :enable_network => true
   memory_deny_write_execute false
   read_write_paths "/store/planet/.htaccess"
   sandbox :enable_network => true
   memory_deny_write_execute false
   read_write_paths "/store/planet/.htaccess"