Fix a few forum configuration issues

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index d21fd25346110d460ff6cb1934c2db80618e9880..4ab841062159a7e15c63c9e850fd149fcbb79053 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -28,6 +28,7 @@ package "php-mysql"
 package "php-apcu"
 
 apache_module "php7.0"
+apache_module "rewrite"
 
 apache_site "default" do
   action [:disable]
@@ -45,8 +46,8 @@ 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"
   depth 1
   user "forum"
   group "forum"
@@ -64,6 +65,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