Use chef cache directory instead of creating our own

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index ec69ac7f2c6cf39d102cf537bd55f0dfdd52957d..0f00019404d22d376b07870694709a31fd7d71a6 100644 (file)
--- 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,23 +16,29 @@
 # 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"
 
+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
+  php-cli
+  php-mysql
+  php-xml
+  php-apcu
+  unzip
+]
 
-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
@@ -48,10 +54,29 @@ 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
+
+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 0o644
+  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