include_recipe "passenger"
include_recipe "git"
include_recipe "mysql"
+include_recipe "nodejs"
include_recipe "postgresql"
-
-package "php-apc"
-package "php-db"
-package "php-cgiwrap"
-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 "python"
-package "python-argparse"
-package "python-beautifulsoup"
-package "python-cheetah"
-package "python-dateutil"
-package "python-magic"
-package "python-psycopg2"
-
-easy_install_package "geojson"
+include_recipe "python"
+
+package %w[
+ php
+ php-cgi
+ php-cli
+ php-curl
+ php-db
+ php-fpm
+ php-imagick
+ php-mcrypt
+ php-mysql
+ php-pear
+ php-pgsql
+ php-sqlite3
+]
+
+package %w[
+ pngcrush
+ pngquant
+]
+
+package %w[
+ python
+ python-argparse
+ python-beautifulsoup
+ python-cheetah
+ python-dateutil
+ python-magic
+ python-psycopg2
+ python-gdal
+]
+
+nodejs_package "svgo"
+
+python_package "geojson"
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"
+package "apache2-suexec-pristine"
+
gem_package "sqlite3"
gem_package "rails" do
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 0644
- notifies :reload, "service[php5-fpm]"
+ mode 0o644
+ 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"
source "phppgadmin.conf.erb"
owner "root"
group "root"
- mode 0644
+ mode 0o644
end
file "/etc/apache2/conf.d/phppgadmin" do
search(:accounts, "*:*").each do |account|
name = account["id"]
details = node[:accounts][:users][name] || {}
+
+ next unless %w[user administrator].include?(details[:status])
+
+ user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
+
+ next unless File.directory?("#{user_home}/public_html")
+
port = 7000 + account["uid"].to_i
- if %w(user administrator).include?(details[:status])
- user_home = details[:home] || account["home"] || "#{node[:accounts][:home]}/#{name}"
-
- if File.directory?("#{user_home}/public_html")
- template "/etc/php5/fpm/pool.d/#{name}.conf" do
- source "fpm.conf.erb"
- owner "root"
- group "root"
- mode 0644
- variables :user => name, :port => port
- notifies :reload, "service[php5-fpm]"
- end
+ 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[php7.0-fpm]"
+ end
- apache_site "#{name}.dev.openstreetmap.org" do
- template "apache.user.erb"
- directory "#{user_home}/public_html"
- variables :user => name, :port => port
- end
- end
+ ssl_certificate "#{name}.dev.openstreetmap.org" do
+ domains ["#{name}.dev.openstreetmap.org", "#{name}.dev.osm.org"]
+ notifies :reload, "service[apache2]"
+ end
+
+ apache_site "#{name}.dev.openstreetmap.org" do
+ template "apache.user.erb"
+ directory "#{user_home}/public_html"
+ variables :user => name, :port => port
+ end
+
+ template "/etc/sudoers.d/#{name}" do
+ source "sudoers.user.erb"
+ owner "root"
+ group "root"
+ mode 0o440
+ variables :user => name
end
end
-if node[:postgresql][:clusters][:"9.1/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
+ cookbook "web"
+ source "cleanup-assets.erb"
+ owner "root"
+ group "root"
+ mode 0o755
end
node[:dev][:rails].each do |name, details|
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
source "rails.setup.rb.erb"
owner "apis"
group "apis"
- mode 0644
+ mode 0o644
variables :site => site_name
- notifies :touch, "file[#{rails_directory}/tmp/restart.txt]"
+ notifies :restart, "rails_port[#{site_name}]"
+ end
+
+ ssl_certificate site_name do
+ domains [site_name] + site_aliases
+ notifies :reload, "service[apache2]"
end
apache_site site_name do
recursive true
end
- file "/etc/cron.daily/rails-#{name}" do
+ file "/etc/cron.daily/rails-#{site_name.tr('.', '-')}" do
action :delete
end
postgresql_database database_name do
action :drop
- cluster "9.3/main"
+ cluster "9.5/main"
end
node.normal[:dev][:rails].delete(name)
directory "/srv/apis.dev.openstreetmap.org" do
owner "apis"
group "apis"
- mode 0755
+ mode 0o755
end
template "/srv/apis.dev.openstreetmap.org/index.html" do
source "apis.html.erb"
owner "apis"
group "apis"
- mode 0644
+ 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
projects / chef.git / blobdiff