X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1399e23b23133c1ff7b8eee39fa5b1ca5c2bdc75..eb1313a389c4d7f517b78a0dfbe0f81f2d9095a2:/cookbooks/dev/recipes/default.rb diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb index 607d723b2..8d0a86e53 100644 --- a/cookbooks/dev/recipes/default.rb +++ b/cookbooks/dev/recipes/default.rb @@ -24,6 +24,7 @@ include_recipe "apache" include_recipe "passenger" include_recipe "git" include_recipe "mysql" +include_recipe "nodejs" include_recipe "postgresql" package "php-apc" @@ -41,6 +42,9 @@ package "php5-mysql" package "php5-pgsql" package "php5-sqlite" +package "pngcrush" +package "pngquant" + package "python" package "python-argparse" package "python-beautifulsoup" @@ -48,6 +52,9 @@ package "python-cheetah" package "python-dateutil" package "python-magic" package "python-psycopg2" +package "python-gdal" + +nodejs_package "svgo" easy_install_package "geojson" @@ -57,6 +64,7 @@ apache_module "proxy" apache_module "proxy_fcgi" apache_module "rewrite" apache_module "wsgi" +apache_module "headers" gem_package "sqlite3" @@ -74,7 +82,7 @@ template "/etc/php5/fpm/pool.d/default.conf" do source "fpm-default.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 notifies :reload, "service[php5-fpm]" end @@ -89,7 +97,7 @@ template "/etc/phppgadmin/config.inc.php" do source "phppgadmin.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 end file "/etc/apache2/conf.d/phppgadmin" do @@ -116,7 +124,7 @@ search(:accounts, "*:*").each do |account| source "fpm.conf.erb" owner "root" group "root" - mode 0644 + mode 0o644 variables :user => name, :port => port notifies :reload, "service[php5-fpm]" end @@ -126,15 +134,30 @@ search(:accounts, "*:*").each do |account| 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.3/main"] postgresql_user "apis" do cluster "9.3/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| - ruby node[:passenger][:ruby_version] database_name = details[:database] || "apis_#{name}" site_name = "#{name}.apis.dev.openstreetmap.org" rails_directory = "/srv/#{name}.apis.dev.openstreetmap.org" @@ -173,7 +196,7 @@ if node[:postgresql][:clusters][:"9.1/main"] source "rails.setup.rb.erb" owner "apis" group "apis" - mode 0644 + mode 0o644 variables :site => site_name notifies :run, "execute[#{rails_directory}]" end @@ -192,7 +215,7 @@ if node[:postgresql][:clusters][:"9.1/main"] recursive true end - file "/etc/cron.daily/rails-#{name}" do + file "/etc/cron.daily/rails-#{site_name.tr('.', '-')}" do action :delete end @@ -208,14 +231,14 @@ if node[:postgresql][:clusters][:"9.1/main"] 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 apache_site "apis.dev.openstreetmap.org" do