X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/32a423888e0d6b5254c55e4faf418b31749dc69e..1339d82c4c3b3d37bd51172845ec2df9b77cad6a:/cookbooks/forum/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index e6f131113..826310f73 100644
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: forum
+# Cookbook:: forum
 # Recipe:: default
 #
-# Copyright 2014, OpenStreetMap Foundation
+# Copyright:: 2014, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,19 +16,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+include_recipe "accounts"
 include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"
+include_recipe "php::apache"
+
+cache_dir = Chef::Config[:file_cache_path]
 
 passwords = data_bag_item("forum", "passwords")
 
-package "php"
-package "php-cli"
-package "php-mysql"
-package "php-xml"
-package "php-apcu"
+package %w[
+  php-cli
+  php-mysql
+  php-xml
+  php-apcu
+  unzip
+]
 
-apache_module "php7.0"
+apache_module "env"
 apache_module "rewrite"
 
 ssl_certificate "forum.openstreetmap.org" do
@@ -43,7 +50,7 @@ end
 directory "/srv/forum.openstreetmap.org" do
   owner "forum"
   group "forum"
-  mode 0o755
+  mode "755"
 end
 
 git "/srv/forum.openstreetmap.org/html/" do
@@ -56,23 +63,41 @@ git "/srv/forum.openstreetmap.org/html/" do
   notifies :reload, "service[apache2]"
 end
 
+remote_file "#{cache_dir}/air3_v0.8.zip" do
+  action :create_if_missing
+  source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"
+  owner "root"
+  group "root"
+  mode "644"
+  backup false
+end
+
+execute "#{cache_dir}/air3_v0.8.zip" do
+  action :nothing
+  command "unzip -o -qq #{cache_dir}/air3_v0.8.zip Air3.css 'Air3/*'"
+  cwd "/srv/forum.openstreetmap.org/html/style"
+  user "forum"
+  group "forum"
+  subscribes :run, "remote_file[#{cache_dir}/air3_v0.8.zip]", :immediately
+end
+
 directory "/srv/forum.openstreetmap.org/html/cache/" do
   owner "www-data"
   group "www-data"
-  mode 0o755
+  mode "755"
 end
 
 directory "/srv/forum.openstreetmap.org/html/img/avatars/" do
   owner "www-data"
   group "www-data"
-  mode 0o755
+  mode "755"
 end
 
 template "/srv/forum.openstreetmap.org/html/config.php" do
   source "config.php.erb"
   owner "forum"
   group "www-data"
-  mode 0o440
+  mode "440"
   variables :passwords => passwords
 end
 
@@ -88,6 +113,6 @@ template "/etc/cron.daily/forum-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0o750
+  mode "750"
   variables :passwords => passwords
 end