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

[chef.git] / cookbooks / tilelog / recipes / default.rb

diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb
index fd27931bf5bb26eb3c594f53f60f36378b4971de..9370225150ec2f748ae8686174c6fdec409436e5 100644 (file)
--- a/cookbooks/tilelog/recipes/default.rb
+++ b/cookbooks/tilelog/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"
+include_recipe "planet::aws"

 include_recipe "python"
 
 passwords = data_bag_item("tilelog", "passwords")
 include_recipe "python"
 
 passwords = data_bag_item("tilelog", "passwords")


@@ -31,12 +33,12 @@ end
 python_package "tilelog" do
   python_virtualenv tilelog_directory
   python_version "3"
 python_package "tilelog" do
   python_virtualenv tilelog_directory
   python_version "3"

-  version "1.4.0"
+  version "1.7.0"

 end
 
 directory tilelog_output_directory do
 end
 
 directory tilelog_output_directory do

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

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


@@ -52,13 +54,12 @@ end
 
 systemd_service "tilelog" do
   description "Tile log analysis"
 
 systemd_service "tilelog" do
   description "Tile log analysis"

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

   exec_start "/usr/local/bin/tilelog"
   nice 10
   exec_start "/usr/local/bin/tilelog"
   nice 10

-  private_tmp true
-  private_devices true
-  protect_system "strict"
-  protect_home true
+  sandbox :enable_network => true
+  protect_home "tmpfs"
+  bind_paths "/home/planet"

   read_write_paths tilelog_output_directory
 end
 
   read_write_paths tilelog_output_directory
 end