Merge remote-tracking branch 'github/pull/69'

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

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 766f2f4b0760f1d41a1b085f0138fd1219c59a93..50ee08a3da62b86754e3e8917fa16a57c26d5341 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -39,8 +39,7 @@ apache_module "wsgi"
 
 node[:osqa][:sites].each do |site|
   name = site[:name]
 
 node[:osqa][:sites].each do |site|
   name = site[:name]

-  directory = site[:directory] || "/var/www/#{name}"
-  osqa_revision = site[:revision] || node[:osqa][:revision]
+  directory = site[:directory] || "/srv/#{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
   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,48 +47,51 @@ 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]
   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"
 
   apache_site name do
     template "apache.erb"

-    directory "#{directory}/osqa"
+    directory directory

     variables :user => site_user, :group => site_group
   end
 
     variables :user => site_user, :group => site_group
   end
 

+  directory directory do
+    owner site_user
+    group site_group
+    mode 0o755
+  end
+

   execute "osqa-migrate" do
     action :nothing
     command "python manage.py migrate forum"
     cwd "#{directory}/osqa"
     user site_user
     group site_group
   execute "osqa-migrate" do
     action :nothing
     command "python manage.py migrate forum"
     cwd "#{directory}/osqa"
     user site_user
     group site_group

-    notifies :reload, resources(:service => "apache2")
+    notifies :reload, "service[apache2]"

   end
 
   end
 

-  subversion "#{directory}/osqa" do
+  git "#{directory}/osqa" do

     action :sync
     action :sync

-    repository "http://svn.osqa.net/svnroot/osqa/trunk"
-    revision osqa_revision
+    repository "git://git.openstreetmap.org/osqa.git"
+    revision "live"

     user site_user
     group site_group
     user site_user
     group site_group

-    notifies :run, resources(:execute => "osqa-migrate")
+    notifies :run, "execute[osqa-migrate]"

   end
 
   end
 

-  remote_directory "#{directory}/osqa/forum_modules/osmauth" do
-    source "osmauth"
-    owner site_user
+  directory "#{directory}/upfiles" do
+    user site_user

     group site_group
     group site_group

-    mode 0755
-    files_owner site_user
-    files_group site_group
-    files_mode 0644
+    mode 0o755

   end
 
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
     group site_group
   end
 
   template "#{directory}/osqa/osqa.wsgi" do
     source "osqa.wsgi.erb"
     owner site_user
     group site_group

-    mode 0644
+    mode 0o644

     variables :directory => directory
     variables :directory => directory

-    notifies :reload, resources(:service => "apache2")
+    notifies :reload, "service[apache2]"

   end
 
   settings = edit_file "#{directory}/osqa/settings_local.py.dist" do |line|
   end
 
   settings = edit_file "#{directory}/osqa/settings_local.py.dist" do |line|


@@ -97,9 +99,10 @@ node[:osqa][:sites].each do |site|
     line.gsub!(/^( *)'NAME': '.*',/, "\\1'NAME': '#{database_name}',")
     line.gsub!(/^( *)'USER': '.*',/, "\\1'USER': '#{database_user}',")
     line.gsub!(/^( *)'PASSWORD': '.*',/, "\\1'PASSWORD': '#{database_password}',")
     line.gsub!(/^( *)'NAME': '.*',/, "\\1'NAME': '#{database_name}',")
     line.gsub!(/^( *)'USER': '.*',/, "\\1'USER': '#{database_user}',")
     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!(/^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
     line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']")
 
     line


@@ -108,8 +111,16 @@ node[:osqa][:sites].each do |site|
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group
   file "#{directory}/osqa/settings_local.py" do
     owner site_user
     group site_group

-    mode 0644
+    mode 0o644

     content settings
     content settings

-    notifies :reload, resources(:service => "apache2")
+    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
   end
 end