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 aefd6594d0e8989c99eb74a1eed4633778f59e23..80b80586b419a0c31be19ac6f1a662e8952c98d5 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -20,12 +20,13 @@
 require "yaml"
 require "securerandom"
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "passenger"
 include_recipe "git"
 include_recipe "mysql"
 include_recipe "nodejs"
 include_recipe "postgresql"
+include_recipe "python"
 
 package "php"
 package "php-cgi"
@@ -54,7 +55,7 @@ package "python-gdal"
 
 nodejs_package "svgo"
 
-easy_install_package "geojson"
+python_package "geojson"
 
 apache_module "env"
 apache_module "expires"
@@ -112,7 +113,7 @@ search(:accounts, "*:*").each do |account|
   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}"