X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1aa4dc4645246a750f53b37f383a4348f1065770..f8dc0471f00dedf4a05519f796c147f3d3f8f4d0:/cookbooks/forum/recipes/default.rb

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 4bf5765f2..6db52c51c 100644
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -8,7 +8,7 @@
 # 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,21 +16,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 include_recipe "mysql"
 
 passwords = data_bag_item("forum", "passwords")
 
-package "php"
-package "php-cli"
-package "php-mysql"
-package "php-apcu"
+package %w[
+  php
+  php-cli
+  php-mysql
+  php-xml
+  php-apcu
+]
 
-apache_module "php7.0"
+apache_module "php7.2"
+apache_module "rewrite"
 
-apache_site "default" do
-  action [:disable]
+ssl_certificate "forum.openstreetmap.org" do
+  domains ["forum.openstreetmap.org", "forum.osm.org"]
+  notifies :reload, "service[apache2]"
 end
 
 apache_site "forum.openstreetmap.org" do
@@ -46,10 +51,47 @@ 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
+
+file "/srv/forum.openstreetmap.org/html/style/Midnight.css" do
+  action :delete
+end
+
+directory "/srv/forum.openstreetmap.org/html/style/Midnight" do
+  action :delete
+  recursive true
+end
+
+file "/srv/forum.openstreetmap.org/html/style/Victory.css" do
+  action :delete
+end
+
+directory "/srv/forum.openstreetmap.org/html/style/Victory" do
+  action :delete
+  recursive true
+end
+
+remote_file "/var/cache/chef/air3_v0.6.zip" do
+  action :create_if_missing
+  source "https://fluxbb.org/resources/styles/air3/releases/0.6/air3_v0.6.zip"
+  owner "root"
+  group "root"
+  mode 0o644
+  backup false
+end
+
+execute "/var/cache/chef/air3_v0.6.zip" do
+  action :nothing
+  command "unzip -qq /var/cache/chef/air3_v0.6.zip Air3.css Air3/*"
+  cwd "/srv/forum.openstreetmap.org/html/style"
+  user "forum"
+  group "forum"
+  subscribes :run, "remote_file[/var/cache/chef/air3_v0.6.zip]", :immediately
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do
@@ -67,7 +109,7 @@ end
 template "/srv/forum.openstreetmap.org/html/config.php" do
   source "config.php.erb"
   owner "forum"
-  group "forum"
+  group "www-data"
   mode 0o440
   variables :passwords => passwords
 end