Remove bytemark credentials from DNS scripts

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 1df8d1559a6ab96ac630680b27f0a329cde6b010..1e5a4216fb80ee6b6329b3667f811f71b6a1037e 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
 #
-# 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.
@@ -16,10 +16,14 @@
 # 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"
 
+cache_dir = Chef::Config[:file_cache_path]
+
 passwords = data_bag_item("forum", "passwords")
 
 package %w[
@@ -28,6 +32,7 @@ package %w[
   php-mysql
   php-xml
   php-apcu
+  unzip
 ]
 
 apache_module "php7.2"
@@ -58,40 +63,22 @@ git "/srv/forum.openstreetmap.org/html/" do
   notifies :reload, "service[apache2]"
 end
 
-remote_file "/var/cache/chef/midnight-flat-responsive_v1.0.zip" do
-  action :create_if_missing
-  source "https://fluxbb.org/resources/styles/midnight-flat-responsive/releases/1.0/midnight-flat-responsive_v1.0.zip"
-  owner "root"
-  group "root"
-  mode 0o644
-  backup false
-end
-
-execute "/var/cache/chef/midnight-flat-responsive_v1.0.zip" do
-  action :nothing
-  command "unzip -qq /var/cache/chef/midnight-flat-responsive_v1.0.zip Midnight.css Midnight/*"
-  cwd "/srv/forum.openstreetmap.org/html/style"
-  user "forum"
-  group "forum"
-  subscribes :run, "remote_file[/var/cache/chef/midnight-flat-responsive_v1.0.zip]", :immediately
-end
-
-remote_file "/var/cache/chef/victory-responsive-fluxbb-style_v1.0.2.zip" do
+remote_file "#{cache_dir}/air3_v0.8.zip" do
   action :create_if_missing
-  source "https://fluxbb.org/resources/styles/victory-responsive-fluxbb-style/releases/1.0.2/victory-responsive-fluxbb-style_v1.0.2.zip"
+  source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"
   owner "root"
   group "root"
   mode 0o644
   backup false
 end
 
-execute "/var/cache/chef/victory-responsive-fluxbb-style_v1.0.2.zip" do
+execute "#{cache_dir}/air3_v0.8.zip" do
   action :nothing
-  command "unzip -qq /var/cache/chef/victory-responsive-fluxbb-style_v1.0.2.zip Victory.css Victory/*"
+  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[/var/cache/chef/victory-responsive-fluxbb-style_v1.0.2.zip]", :immediately
+  subscribes :run, "remote_file[#{cache_dir}/air3_v0.8.zip]", :immediately
 end
 
 directory "/srv/forum.openstreetmap.org/html/cache/" do