X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/6962e4dff1116f25a7cc4d6525071f351a7b268a..a68415b8f2bf106b6ea5948b0605c897b516ef4f:/cookbooks/forum/recipes/default.rb

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 25de3e896..d21fd2534 100644
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -22,15 +22,15 @@ include_recipe "mysql"
 
 passwords = data_bag_item("forum", "passwords")
 
-package "php5"
-package "php5-cli"
-package "php5-mysql"
-package "php-apc"
+package "php"
+package "php-cli"
+package "php-mysql"
+package "php-apcu"
 
-apache_module "php5"
+apache_module "php7.0"
 
 apache_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
 apache_site "forum.openstreetmap.org" do
@@ -40,7 +40,7 @@ end
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/forum.openstreetmap.org/html/" do
@@ -55,13 +55,13 @@ end
 directory "/srv/forum.openstreetmap.org/html/cache/" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
 
 directory "/srv/forum.openstreetmap.org/html/img/avatars/" do
   owner "www-data"
   group "www-data"
-  mode 0755
+  mode 0o755
 end
 
 mysql_user "forum@localhost" do
@@ -76,6 +76,6 @@ template "/etc/cron.daily/forum-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end