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 395f2ce390d8c61cc7a9a73dfb6ac0d377d31246..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
 #
 # 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,10 +16,14 @@
 # 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"
 

+cache_dir = Chef::Config[:file_cache_path]
+

 passwords = data_bag_item("forum", "passwords")
 
 package %w[
 passwords = data_bag_item("forum", "passwords")
 
 package %w[


@@ -28,9 +32,10 @@ package %w[
   php-mysql
   php-xml
   php-apcu
   php-mysql
   php-xml
   php-apcu

+  unzip

 ]
 
 ]
 

-apache_module "php7.0"
+apache_module "php7.2"

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


@@ -58,6 +63,24 @@ git "/srv/forum.openstreetmap.org/html/" do
   notifies :reload, "service[apache2]"
 end
 
   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
   owner "www-data"
   group "www-data"
 directory "/srv/forum.openstreetmap.org/html/cache/" do
   owner "www-data"
   group "www-data"