X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ac555cac50dd3637a0dbb2e3cf135edabb988bbf..c22837a672db48d4439247608c9f3ebaf2530e0f:/cookbooks/trac/recipes/default.rb diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb index 070a520aa..54ecdca4f 100644 --- a/cookbooks/trac/recipes/default.rb +++ b/cookbooks/trac/recipes/default.rb @@ -17,77 +17,20 @@ # limitations under the License. # -include_recipe "accounts" include_recipe "apache" -package %w[ - trac - ruby -] +apache_module "rewrite" -site_name = "trac.openstreetmap.org" -site_directory = "/srv/#{site_name}" - -directory "/var/lib/trac" do - owner "trac" - group "trac" - mode "755" -end - -execute "trac-initenv-#{site_name}" do - command "trac-admin /var/lib/trac initenv #{site_name} sqlite:db/trac.db" - user "trac" - group "trac" - not_if { ::File.exist?("/var/lib/trac/VERSION") } -end - -template "/var/lib/trac/conf/trac.ini" do - source "trac.ini.erb" - owner "trac" - group "www-data" - mode "644" - variables :name => site_name -end - -remote_directory "/var/lib/trac/htdocs" do - source "htdocs" - owner "trac" - group "trac" - mode "755" - files_owner "trac" - files_group "trac" - files_mode "644" - purge true -end - -remote_directory "/var/lib/trac/templates" do - source "templates" - owner "trac" - group "trac" - mode "755" - files_owner "trac" - files_group "trac" - files_mode "644" - purge true -end - -execute "trac-deploy-#{site_name}" do - command "trac-admin /var/lib/trac deploy #{site_directory}" - user "root" +directory "/srv/trac.openstreetmap.org" do + owner "root" group "root" - not_if { ::File.exist?(site_directory) } + mode "0755" end -cookbook_file "/usr/local/bin/trac-authenticate" do +cookbook_file "/srv/trac.openstreetmap.org/tickets.map" do owner "root" group "root" - mode "755" -end - -apache_module "wsgi" - -apache_module "authnz_external" do - package "libapache2-mod-authnz-external" + mode "0644" end ssl_certificate "trac.openstreetmap.org" do @@ -95,22 +38,7 @@ ssl_certificate "trac.openstreetmap.org" do notifies :reload, "service[apache2]" end -apache_site site_name do +apache_site "trac.openstreetmap.org" do template "apache.erb" - directory site_directory variables :user => "trac", :group => "trac", :aliases => ["trac.osm.org"] end - -template "/etc/sudoers.d/trac" do - source "sudoers.erb" - owner "root" - group "root" - mode "440" -end - -template "/etc/cron.daily/trac-backup" do - source "backup.cron.erb" - owner "root" - group "root" - mode "755" -end