X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/864c167a2b1df8496642199e549bdb3001c43bff..95e1e4603eb8c32acf8ee58c845ec4ce5bfdd56c:/cookbooks/osqa/recipes/default.rb?ds=inline

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 9776791e9..fe8306fdc 100644
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -40,7 +40,6 @@ apache_module "wsgi"
 node[:osqa][:sites].each do |site|
   name = site[:name]
   directory = site[:directory] || "/srv/#{name}"
-  osqa_revision = site[:revision] || node[:osqa][:revision]
   site_user = site[:user] || node[:osqa][:user]
   site_user = Etc.getpwuid(site_user).name if site_user.is_a?(Integer)
   site_group = site[:group] || node[:osqa][:group] || Etc.getpwnam(site_user).gid
@@ -48,6 +47,7 @@ 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"
@@ -101,8 +101,8 @@ node[:osqa][:sites].each do |site|
     line.gsub!(/^( *)'PASSWORD': '.*',/, "\\1'PASSWORD': '#{database_password}',")
     line.gsub!(/^ALLOWED_HOSTS = .*/, "ALLOWED_HOSTS = ('help.openstreetmap.org',)")
     line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'")
-    line.gsub!(/^APP_URL = 'http:\/\/'/, "APP_URL = 'http://#{name}'")
-    line.gsub!(/^TIME_ZONE = 'America\/New_York'/, "TIME_ZONE = 'Europe/London'")
+    line.gsub!(%r{^APP_URL = 'http://'}, "APP_URL = 'http://#{name}'")
+    line.gsub!(%r{^TIME_ZONE = 'America/New_York'}, "TIME_ZONE = 'Europe/London'")
     line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']")
 
     line
@@ -115,4 +115,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