civicrm + extensions version bump

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

diff --git a/cookbooks/planet/recipes/current.rb b/cookbooks/planet/recipes/current.rb
index 6242559eb054714cfc9e8b99efe0471465c817d2..517123f5913219f97a73d9402c419e81415bdac7 100644 (file)
--- a/cookbooks/planet/recipes/current.rb
+++ b/cookbooks/planet/recipes/current.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+node.default[:accounts][:users][:planet][:status] = :role
+

 include_recipe "accounts"
 
 package %w[
 include_recipe "accounts"
 
 package %w[


@@ -27,41 +29,29 @@ template "/usr/local/bin/planet-update" do
   source "planet-update.erb"
   owner "root"
   group "root"
   source "planet-update.erb"
   owner "root"
   group "root"

-  mode 0o755
-end
-
-template "/usr/local/bin/planet-update-file" do
-  source "planet-update-file.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+  mode "755"

 end
 
 directory "/var/lib/planet" do
   owner "planet"
   group "planet"
 end
 
 directory "/var/lib/planet" do
   owner "planet"
   group "planet"

-  mode 0o755
+  mode "755"

 end
 
 end
 

-remote_file "/var/lib/planet/planet.pbf" do
+remote_file "/var/lib/planet/planet.osh.pbf" do

   action :create_if_missing
   action :create_if_missing

-  source "https://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
+  source "https://planet.openstreetmap.org/pbf/full-history/history-latest.osm.pbf"

   owner "planet"
   group "planet"
   owner "planet"
   group "planet"

-  mode 0o644
-  not_if { ENV["TEST_KITCHEN"] }
+  mode "644"
+  not_if { kitchen? }

 end
 
 end
 

-cron_d "planet-update" do
-  minute "17"
-  hour "1"
-  user "root"
-  command "/usr/local/bin/planet-update"
-end
-
-template "/etc/logrotate.d/planet-update" do
-  source "planet-update.logrotate.erb"
-  owner "root"
-  group "root"
-  mode 0o644
+systemd_service "planet-update" do
+  description "Planet file update"
+  type "oneshot"
+  exec_start "/usr/local/bin/planet-update"
+  user "planet"
+  sandbox :enable_network => true
+  read_write_paths "/var/lib/planet"

 end
 end