Reduce WAL expiry to 14 days

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

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 3c5dafe250b2d8f56949c2b0a69f70ab17e5bd70..80b80586b419a0c31be19ac6f1a662e8952c98d5 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -26,6 +26,7 @@ include_recipe "git"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"

+include_recipe "python"

 
 package "php"
 package "php-cgi"
 
 package "php"
 package "php-cgi"


@@ -54,7 +55,7 @@ package "python-gdal"
 
 nodejs_package "svgo"
 
 
 nodejs_package "svgo"
 

-easy_install_package "geojson"
+python_package "geojson"

 
 apache_module "env"
 apache_module "expires"
 
 apache_module "env"
 apache_module "expires"


@@ -112,7 +113,7 @@ search(:accounts, "*:*").each do |account|
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 
   name = account["id"]
   details = node[:accounts][:users][name] || {}
 

-  next unless %w(user administrator).include?(details[:status])
+  next unless %w[user administrator].include?(details[:status])

 
   user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
 
 
   user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
 


@@ -201,6 +202,11 @@ if node[:postgresql][:clusters][:"9.5/main"]
         notifies :run, "execute[#{rails_directory}]"
       end
 
         notifies :run, "execute[#{rails_directory}]"
       end
 

+      ssl_certificate site_name do
+        domains [site_name] + site_aliases
+        notifies :reload, "service[apache2]"
+      end
+

       apache_site site_name do
         template "apache.rails.erb"
         variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base
       apache_site site_name do
         template "apache.rails.erb"
         variables :name => site_name, :aliases => site_aliases, :secret_key_base => secret_key_base


@@ -241,6 +247,11 @@ if node[:postgresql][:clusters][:"9.5/main"]
     mode 0o644
   end
 
     mode 0o644
   end
 

+  ssl_certificate "apis.dev.openstreetmap.org" do
+    domains "apis.dev.openstreetmap.org"
+    notifies :reload, "service[apache2]"
+  end
+

   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end
   apache_site "apis.dev.openstreetmap.org" do
     template "apache.apis.erb"
   end