X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/069e33163e0b09a7d647a98c2fde284a16a43b99..ad4da3b5b4a92d20a0904b005b86afae4a492f86:/cookbooks/osqa/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb index db96e2e79..50ee08a3d 100644 --- a/cookbooks/osqa/recipes/default.rb +++ b/cookbooks/osqa/recipes/default.rb @@ -58,7 +58,7 @@ node[:osqa][:sites].each do |site| directory directory do owner site_user group site_group - mode 0755 + mode 0o755 end execute "osqa-migrate" do @@ -82,14 +82,14 @@ node[:osqa][:sites].each do |site| directory "#{directory}/upfiles" do user site_user group site_group - mode 0755 + 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 @@ -102,7 +102,7 @@ node[:osqa][:sites].each do |site| line.gsub!(/^ALLOWED_HOSTS = .*/, "ALLOWED_HOSTS = ('help.openstreetmap.org',)") line.gsub!(/^CACHE_BACKEND = .*/, "CACHE_BACKEND = 'memcached://127.0.0.1:11211/'") line.gsub!(%r{^APP_URL = 'http://'}, "APP_URL = 'http://#{name}'") - line.gsub!(/^TIME_ZONE = 'America\/New_York'/, "TIME_ZONE = 'Europe/London'") + line.gsub!(%r{^TIME_ZONE = 'America/New_York'}, "TIME_ZONE = 'Europe/London'") line.gsub!(/^DISABLED_MODULES = \[([^\]]+)\]/, "DISABLED_MODULES = [\\1, 'localauth', 'facebookauth', 'oauthauth']") line @@ -111,7 +111,7 @@ 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 @@ -120,7 +120,7 @@ node[:osqa][:sites].each do |site| source "backup.cron.erb" owner "root" group "root" - mode 0755 + mode 0o755 variables :name => backup_name, :directory => directory, :user => site_user, :database => database_name end end