Merge pull request #308 from Firefishy/more-404-tiles

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 6db52c51c034ac4d8120e337587684bc8bcaba2d..5bc7da4649b61630838e957ef6ca837caf9cacac 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: forum
+# Cookbook:: forum

 # Recipe:: default
 #
 # 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -16,21 +16,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # 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 "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 %w[
 
 passwords = data_bag_item("forum", "passwords")
 
 package %w[

-  php

   php-cli
   php-mysql
   php-xml
   php-apcu
   php-cli
   php-mysql
   php-xml
   php-apcu

+  unzip

 ]
 
 ]
 

-apache_module "php7.2"

 apache_module "rewrite"
 
 ssl_certificate "forum.openstreetmap.org" do
 apache_module "rewrite"
 
 ssl_certificate "forum.openstreetmap.org" do


@@ -58,40 +62,22 @@ git "/srv/forum.openstreetmap.org/html/" do
   notifies :reload, "service[apache2]"
 end
 
   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
+remote_file "#{cache_dir}/air3_v0.8.zip" do

   action :create_if_missing
   action :create_if_missing

-  source "https://fluxbb.org/resources/styles/air3/releases/0.6/air3_v0.6.zip"
+  source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"

   owner "root"
   group "root"
   mode 0o644
   backup false
 end
 
   owner "root"
   group "root"
   mode 0o644
   backup false
 end
 

-execute "/var/cache/chef/air3_v0.6.zip" do
+execute "#{cache_dir}/air3_v0.8.zip" do

   action :nothing
   action :nothing

-  command "unzip -qq /var/cache/chef/air3_v0.6.zip Air3.css Air3/*"
+  command "unzip -o -qq #{cache_dir}/air3_v0.8.zip Air3.css 'Air3/*'"

   cwd "/srv/forum.openstreetmap.org/html/style"
   user "forum"
   group "forum"
   cwd "/srv/forum.openstreetmap.org/html/style"
   user "forum"
   group "forum"

-  subscribes :run, "remote_file[/var/cache/chef/air3_v0.6.zip]", :immediately
+  subscribes :run, "remote_file[#{cache_dir}/air3_v0.8.zip]", :immediately

 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do