include_recipe "nodejs"
include_recipe "postgresql"
-package "php-apc"
+package "php"
+package "php-cgi"
+package "php-cli"
+package "php-curl"
package "php-db"
-package "php-cgiwrap"
+package "php-fpm"
+package "php-imagick"
+package "php-mcrypt"
+package "php-mysql"
package "php-pear"
-
-package "php5-cgi"
-package "php5-cli"
-package "php5-curl"
-package "php5-fpm"
-package "php5-imagick"
-package "php5-mcrypt"
-package "php5-mysql"
-package "php5-pgsql"
-package "php5-sqlite"
+package "php-pgsql"
+package "php-sqlite3"
package "pngcrush"
package "pngquant"
apache_module "env"
apache_module "expires"
+apache_module "headers"
apache_module "proxy"
apache_module "proxy_fcgi"
apache_module "rewrite"
+apache_module "suexec"
+apache_module "userdir"
apache_module "wsgi"
-apache_module "headers"
+
+package "apache2-suexec-pristine"
gem_package "sqlite3"
version "3.0.9"
end
-service "php5-fpm" do
- provider Chef::Provider::Service::Upstart
+service "php7.0-fpm" do
action [:enable, :start]
- supports :status => true, :restart => true, :reload => true
end
-template "/etc/php5/fpm/pool.d/default.conf" do
+template "/etc/php/7.0/fpm/pool.d/default.conf" do
source "fpm-default.conf.erb"
owner "root"
group "root"
mode 0o644
- notifies :reload, "service[php5-fpm]"
+ notifies :reload, "service[php7.0-fpm]"
end
-file "/etc/php5/fpm/pool.d/www.conf" do
+file "/etc/php/7.0/fpm/pool.d/www.conf" do
action :delete
- notifies :reload, "service[php5-fpm]"
+ notifies :reload, "service[php7.0-fpm]"
end
package "phppgadmin"
port = 7000 + account["uid"].to_i
- template "/etc/php5/fpm/pool.d/#{name}.conf" do
+ template "/etc/php/7.0/fpm/pool.d/#{name}.conf" do
source "fpm.conf.erb"
owner "root"
group "root"
mode 0o644
variables :user => name, :port => port
- notifies :reload, "service[php5-fpm]"
+ notifies :reload, "service[php7.0-fpm]"
end
apache_site "#{name}.dev.openstreetmap.org" do
end
end
-if node[:postgresql][:clusters][:"9.3/main"]
+if node[:postgresql][:clusters][:"9.5/main"]
postgresql_user "apis" do
- cluster "9.3/main"
+ cluster "9.5/main"
end
template "/usr/local/bin/cleanup-rails-assets" do
node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
postgresql_database database_name do
- cluster "9.3/main"
+ cluster "9.5/main"
owner "apis"
end
postgresql_extension "#{database_name}_btree_gist" do
- cluster "9.3/main"
+ cluster "9.5/main"
database database_name
extension "btree_gist"
end
group "apis"
repository details[:repository]
revision details[:revision]
- database_port node[:postgresql][:clusters][:"9.3/main"][:port]
+ database_port node[:postgresql][:clusters][:"9.5/main"][:port]
database_name database_name
database_username "apis"
run_migrations true
postgresql_database database_name do
action :drop
- cluster "9.3/main"
+ cluster "9.5/main"
end
node.normal[:dev][:rails].delete(name)