Update forum to fluxbb 1.5.10

[chef.git] / cookbooks / forum / recipes / default.rb

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 880598fb7ec0ff4a832c5a27cec03b073bcc5d76..58fa9a22d59f28a1c7b20bbe6d784168f9de9edc 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -25,9 +25,11 @@ passwords = data_bag_item("forum", "passwords")
 package "php"
 package "php-cli"
 package "php-mysql"
+package "php-xml"
 package "php-apcu"
 
 apache_module "php7.0"
+apache_module "rewrite"
 
 apache_site "default" do
   action [:disable]
@@ -46,10 +48,11 @@ end
 git "/srv/forum.openstreetmap.org/html/" do
   action :sync
   repository "http://github.com/openstreetmap/openstreetmap-forum.git"
-  revision "openstreetmap"
+  revision "openstreetmap-1.5.10"
   depth 1
   user "forum"
   group "forum"
+  notifies :reload, "service[apache2]"
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do
@@ -64,6 +67,14 @@ directory "/srv/forum.openstreetmap.org/html/img/avatars/" do
   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
   password passwords["database"]
 end