Use the planet user consistently for generating planet data

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index c4ad10ecd2793d698c82123b7aa7393a627fc2f2..f7e090ac2e6e1dc129def9c63d59feb31d9857bb 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -51,7 +51,7 @@ end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
   files_owner "root"
@@ -61,7 +61,7 @@ end
 
 remote_directory "/store/planet/cc-by-sa" do
   source "ccbysa_cgi"
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
   files_owner "root"
@@ -71,7 +71,7 @@ end
 
 remote_directory "/store/planet/cc-by-sa/full-experimental" do
   source "ccbysa_history_cgi"
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
   files_owner "root"
@@ -82,20 +82,20 @@ end
 [:xml_directory, :xml_history_directory,
  :pbf_directory, :pbf_history_directory].each do |dir|
   directory node[:planet][:dump][dir] do
-    owner "www-data"
+    owner "planet"
     group "planet"
     mode "775"
   end
 end
 
 directory "/store/planet/notes" do
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
 end
 
 directory "/store/planet/statistics" do
-  owner "www-data"
+  owner "planet"
   group "planet"
   mode "775"
 end
@@ -141,7 +141,7 @@ end
 systemd_service "planet-file-cleanup" do
   description "Cleanup old planet files"
   exec_start "/usr/local/bin/planet-file-cleanup --debug"
-  user "www-data"
+  user "planet"
   sandbox true
   read_write_paths [
     node[:planet][:dump][:xml_directory],

diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index f7a1431818e28b5defb38b745d7c320a88d7891a..854c0a7c6c174b0bbc1b62df8b9a779f4035ae41 100644 (file)
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -88,8 +88,8 @@ execute "/opt/planet-dump-ng/Makefile" do
 end
 
 directory "/store/planetdump" do
-  owner "www-data"
-  group "www-data"
+  owner "planet"
+  group "planet"
   mode "755"
   recursive true
 end
@@ -105,7 +105,7 @@ end
 
 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
@@ -134,7 +134,7 @@ 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"

diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb
index ffb86243c5f8b766456416a8f9cfb6cfc25466b6..91c03df4b0185eb0b5d1c8ba8606989dd6a55d43 100644 (file)
--- a/cookbooks/planet/recipes/notes.rb
+++ b/cookbooks/planet/recipes/notes.rb
@@ -54,7 +54,7 @@ end
 systemd_service "planet-notes-dump" do
   description "Create notes dump"
   exec_start "/usr/local/bin/planet-notes-dump"
-  user "www-data"
+  user "planet"
   sandbox :enable_network => true
   read_write_paths "/store/planet/notes"
 end
@@ -78,7 +78,7 @@ end
 systemd_service "planet-notes-cleanup" do
   description "Delete old notes dumps"
   exec_start "/usr/local/bin/planet-notes-cleanup"
-  user "www-data"
+  user "planet"
   sandbox true
   read_write_paths "/store/planet/notes"
 end