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 be229e75b00d68d37c418c7cdde2b5539ccc1f23..4ab841062159a7e15c63c9e850fd149fcbb79053 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -16,20 +16,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_recipe "apache:ssl"
+include_recipe "apache::ssl"
 include_recipe "git"
 include_recipe "mysql"
 
 passwords = data_bag_item("forum", "passwords")
 
-package "php5"
-package "php5-cli"
-package "php-apc"
+package "php"
+package "php-cli"
+package "php-mysql"
+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
@@ -39,13 +41,13 @@ 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"
   depth 1
   user "forum"
   group "forum"
@@ -54,13 +56,21 @@ 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
@@ -75,6 +85,6 @@ template "/etc/cron.daily/forum-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end