Add pnorman public ssh key

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

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index 0d08e322b1770c8faa9586625cfb95533eaae6f9..54ecdca4f837cc29b37005c540d010761ac6e508 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: trac
+# Cookbook:: trac
 # Recipe:: default
 #
-# Copyright 2012, OpenStreetMap Foundation
+# Copyright:: 2012, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,81 +19,26 @@
 
 include_recipe "apache"
 
-package %w[
-  trac
-  trac-git
-  ruby
-]
+apache_module "rewrite"
 
-site_name = "trac.openstreetmap.org"
-site_directory = "/srv/#{site_name}"
-
-template "/var/lib/trac/conf/trac.ini" do
-  source "trac.ini.erb"
-  owner "trac"
-  group "www-data"
-  mode 0o644
-  variables :name => site_name
-end
-
-remote_directory "/var/lib/trac/htdocs" do
-  source "htdocs"
-  owner "trac"
-  group "trac"
-  mode 0o755
-  files_owner "trac"
-  files_group "trac"
-  files_mode 0o644
-  purge true
-end
-
-remote_directory "/var/lib/trac/templates" do
-  source "templates"
-  owner "trac"
-  group "trac"
-  mode 0o755
-  files_owner "trac"
-  files_group "trac"
-  files_mode 0o644
-  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 0o755
+  mode "0644"
 end
 
-apache_module "wsgi"
-
 ssl_certificate "trac.openstreetmap.org" do
-  domains "trac.openstreetmap.org"
+  domains ["trac.openstreetmap.org", "trac.osm.org"]
   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"
-end
-
-template "/etc/sudoers.d/trac" do
-  source "sudoers.erb"
-  owner "root"
-  group "root"
-  mode 0o440
-end
-
-template "/etc/cron.daily/trac-backup" do
-  source "backup.cron.erb"
-  owner "root"
-  group "root"
-  mode 0o755
+  variables :user => "trac", :group => "trac", :aliases => ["trac.osm.org"]
 end