Use fonts-droid-fallback on Ubuntu 16.04

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

diff --git a/cookbooks/planet/recipes/default.rb b/cookbooks/planet/recipes/default.rb
index 0f050ee7d9c2467e5421c6f8ed7a32cded8ff55d..28bf482735766231596f8d1dfa345e9483fa9b32 100644 (file)
--- a/cookbooks/planet/recipes/default.rb
+++ b/cookbooks/planet/recipes/default.rb
@@ -20,15 +20,17 @@
 include_recipe "apache::ssl"
 
 package "perl"
 include_recipe "apache::ssl"
 
 package "perl"

-package "php5-cli"

 package "pbzip2"
 package "osmosis"
 
 package "pbzip2"
 package "osmosis"
 

-template "/etc/cron.d/planet" do
-  source "cron.erb"
-  owner "root"
-  group "root"
-  mode 0644
+if node[:lsb][:release].to_f >= 16.04
+  package "php-cli"
+else
+  package "php5-cli"
+end
+
+file "/etc/cron.d/planet" do
+  action :delete

 end
 
 remote_directory "/store/planet" do
 end
 
 remote_directory "/store/planet" do


@@ -38,27 +40,27 @@ remote_directory "/store/planet" do
   mode "0755"
   files_owner "root"
   files_group "root"
   mode "0755"
   files_owner "root"
   files_group "root"

-  files_mode 0644
+  files_mode 0o644

 end
 
 remote_directory "/store/planet" do
   source "cgi"
   owner "root"
   group "root"
 end
 
 remote_directory "/store/planet" do
   source "cgi"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

   files_owner "root"
   files_group "root"
   files_owner "root"
   files_group "root"

-  files_mode 0755
+  files_mode 0o755

 end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
   owner "www-data"
   group "planet"
 end
 
 remote_directory node[:planet][:dump][:xml_history_directory] do
   source "history_cgi"
   owner "www-data"
   group "planet"

-  mode 0755
-  files_owner "www-data"
-  files_group "planet"
-  files_mode 0755
+  mode 0o755
+  files_owner "root"
+  files_group "root"
+  files_mode 0o755

 end
 
 [:xml_directory, :xml_history_directory,
 end
 
 [:xml_directory, :xml_history_directory,


@@ -66,16 +68,24 @@ end
   directory node[:planet][:dump][dir] do
     owner "www-data"
     group "planet"
   directory node[:planet][:dump][dir] do
     owner "www-data"
     group "planet"

-    mode 0775
+    mode 0o775

   end
 end
 
 directory "/store/planet/notes" do
   owner "www-data"
   group "planet"
   end
 end
 
 directory "/store/planet/notes" do
   owner "www-data"
   group "planet"

-  mode 0775
+  mode 0o775

 end
 
 end
 

+template "/usr/local/bin/apache-latest-planet-filename" do
+  source "apache-latest-planet-filename.erb"
+  owner "root"
+  group "root"
+  mode 0o755
+end
+
+apache_module "cgid"

 apache_module "rewrite"
 apache_module "proxy_http"
 
 apache_module "rewrite"
 apache_module "proxy_http"
 


@@ -87,5 +97,7 @@ template "/etc/logrotate.d/apache2" do
   source "logrotate.apache.erb"
   owner "root"
   group "root"
   source "logrotate.apache.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

 end
 end

+
+munin_plugin "planet_age"