Improve handling of apache mpm selection

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

diff --git a/cookbooks/forum/recipes/default.rb b/cookbooks/forum/recipes/default.rb
index 682a2bfa281057f2a6e08516cc23598c156ee616..1e5a4216fb80ee6b6329b3667f811f71b6a1037e 100644 (file)
--- a/cookbooks/forum/recipes/default.rb
+++ b/cookbooks/forum/recipes/default.rb
@@ -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[


@@ -59,7 +63,7 @@ git "/srv/forum.openstreetmap.org/html/" do
   notifies :reload, "service[apache2]"
 end
 
   notifies :reload, "service[apache2]"
 end
 

-remote_file "/var/cache/chef/air3_v0.8.zip" do
+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"
   action :create_if_missing
   source "https://fluxbb.org/resources/styles/air3/releases/0.8/air3_v0.8.zip"
   owner "root"


@@ -68,13 +72,13 @@ remote_file "/var/cache/chef/air3_v0.8.zip" do
   backup false
 end
 
   backup false
 end
 

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

   action :nothing
   action :nothing

-  command "unzip -o -qq /var/cache/chef/air3_v0.8.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.8.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