X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/587153f55f561d1b1ea8814d5cce1f19cccdd9f1..b3c7c0d36288566eecbabd2570a57b66116d7407:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index a57432411..528bc17d8 100644
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -27,20 +27,18 @@ include_recipe "mysql"
 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"
@@ -60,34 +58,37 @@ easy_install_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"
@@ -96,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
@@ -119,13 +120,13 @@ search(:accounts, "*:*").each do |account|
 
   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 0644
+    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
@@ -133,6 +134,14 @@ 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.3/main"]
@@ -145,7 +154,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
     source "cleanup-assets.erb"
     owner "root"
     group "root"
-    mode 0755
+    mode 0o755
   end
 
   node[:dev][:rails].each do |name, details|
@@ -187,7 +196,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
         source "rails.setup.rb.erb"
         owner "apis"
         group "apis"
-        mode 0644
+        mode 0o644
         variables :site => site_name
         notifies :run, "execute[#{rails_directory}]"
       end
@@ -206,7 +215,7 @@ if node[:postgresql][:clusters][:"9.3/main"]
         recursive true
       end
 
-      file "/etc/cron.daily/rails-#{site_name}" do
+      file "/etc/cron.daily/rails-#{site_name.tr('.', '-')}" do
         action :delete
       end
 
@@ -222,14 +231,14 @@ if node[:postgresql][:clusters][:"9.3/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