X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6962e4dff1116f25a7cc4d6525071f351a7b268a..7ac8709dc5be2b83ed87e5a44be2824a3ea07110:/cookbooks/forum/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 25de3e896..58fa9a22d 100644
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -22,15 +22,17 @@ 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-xml"
+package "php-apcu"
 
-apache_module "php5"
+apache_module "php7.0"
+apache_module "rewrite"
 
 apache_site "default" do
-  action [ :disable ]
+  action [:disable]
 end
 
 apache_site "forum.openstreetmap.org" do
@@ -40,28 +42,37 @@ end
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"
-  mode 0755
+  mode 0o755
 end
 
 git "/srv/forum.openstreetmap.org/html/" do
   action :sync
-  repository "http://github.com/fluxbb/fluxbb.git"
-  revision "refs/tags/fluxbb-1.5.6"
+  repository "http://github.com/openstreetmap/openstreetmap-forum.git"
+  revision "openstreetmap-1.5.10"
   depth 1
   user "forum"
   group "forum"
+  notifies :reload, "service[apache2]"
 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
+
+template "/srv/forum.openstreetmap.org/html/config.php" do
+  source "config.php.erb"
+  owner "forum"
+  group "www-data"
+  mode 0o440
+  variables :passwords => passwords
 end
 
 mysql_user "forum@localhost" do
@@ -76,6 +87,6 @@ template "/etc/cron.daily/forum-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end