X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0c94f68819ad68e8dc001e3013ebe9782bd4215c..3b2d91d9fb2bd2878d12d02af78484f9ea43f8f7:/cookbooks/osqa/recipes/default.rb

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index d4ed159c8..6d610e02f 100644
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -18,8 +18,9 @@
 #
 
 include_recipe "tools"
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "memcached"
+include_recipe "python"
 
 package "python-django"
 package "python-html5lib"
@@ -30,17 +31,14 @@ package "python-mysqldb"
 package "python-psycopg2"
 package "python-setuptools"
 
-easy_install_package "South" do
-  package_name "south"
-end
+python_package "South"
 
 apache_module "rewrite"
 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_name = site[:name]
+  directory = site[:directory] || "/srv/#{site_name}"
   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,17 +46,23 @@ 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
+  ssl_certificate site_name do
+    domains site_name
+    notifies :reload, "service[apache2]"
+  end
+
+  apache_site site_name do
     template "apache.erb"
-    directory "#{directory}/osqa"
+    directory directory
     variables :user => site_user, :group => site_group
   end
 
   directory directory do
     owner site_user
     group site_group
-    mode 0755
+    mode 0o755
   end
 
   execute "osqa-migrate" do
@@ -79,11 +83,17 @@ node[:osqa][:sites].each do |site|
     notifies :run, "execute[osqa-migrate]"
   end
 
+  directory "#{directory}/upfiles" do
+    user site_user
+    group site_group
+    mode 0o755
+  end
+
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
     group site_group
-    mode 0644
+    mode 0o644
     variables :directory => directory
     notifies :reload, "service[apache2]"
   end
@@ -95,8 +105,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 = 'https://#{site_name}'")
+    line.gsub!(%r{^TIME_ZONE = 'America/New_York'}, "TIME_ZONE = 'Europe/London'")
     line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']")
 
     line
@@ -105,8 +115,16 @@ node[:osqa][:sites].each do |site|
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
-    mode 0644
+    mode 0o644
     content settings
     notifies :reload, "service[apache2]"
   end
+
+  template "/etc/cron.daily/#{backup_name}-backup" do
+    source "backup.cron.erb"
+    owner "root"
+    group "root"
+    mode 0o755
+    variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name
+  end
 end