Disable deprecated SSLv3 (POODLE fix)

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

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index d4ed159c89e6a1b93daaecd569e208a0f94866cf..de65ad99b7248e379dcab3f173f3d68bf60cc957 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -48,10 +48,11 @@ node[:osqa][:sites].each do |site|
   database_name = site[:database_name] || node[:osqa][:database_name]
   database_user = site[:database_user] || node[:osqa][:database_user]
   database_password = site[:database_user] || node[:osqa][:database_password]
+  backup_name = site[:backup]
 
   apache_site name do
     template "apache.erb"
-    directory "#{directory}/osqa"
+    directory directory
     variables :user => site_user, :group => site_group
   end
 
@@ -79,6 +80,12 @@ node[:osqa][:sites].each do |site|
     notifies :run, "execute[osqa-migrate]"
   end
 
+  directory "#{directory}/upfiles" do
+    user site_user
+    group site_group
+    mode 0755
+  end
+
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
@@ -109,4 +116,12 @@ node[:osqa][:sites].each do |site|
     content settings
     notifies :reload, "service[apache2]"
   end
+
+  template "/etc/cron.daily/#{backup_name}-backup" do
+    source "backup.cron.erb"
+    owner "root"
+    group "root"
+    mode 0755
+    variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name
+  end
 end