hardware: Remove legacy G4 cleanup code

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

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index 42cff06493bf8a8734a576e7ba15b68ede8a387d..4f5526002cc5ad6e2dd6142b0f6bb11d987d0bf7 100644 (file)
--- a/cookbooks/trac/recipes/default.rb
+++ b/cookbooks/trac/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,11 +17,13 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 

-package "trac"
-package "trac-git"
-package "ruby"
+package %w[
+  trac
+  trac-git
+  ruby
+]

 
 site_name = "trac.openstreetmap.org"
 site_directory = "/srv/#{site_name}"
 
 site_name = "trac.openstreetmap.org"
 site_directory = "/srv/#{site_name}"


@@ -30,7 +32,7 @@ template "/var/lib/trac/conf/trac.ini" do
   source "trac.ini.erb"
   owner "trac"
   group "www-data"
   source "trac.ini.erb"
   owner "trac"
   group "www-data"

-  mode 0644
+  mode 0o644

   variables :name => site_name
 end
 
   variables :name => site_name
 end
 


@@ -38,10 +40,10 @@ remote_directory "/var/lib/trac/htdocs" do
   source "htdocs"
   owner "trac"
   group "trac"
   source "htdocs"
   owner "trac"
   group "trac"

-  mode 0755
+  mode 0o755

   files_owner "trac"
   files_group "trac"
   files_owner "trac"
   files_group "trac"

-  files_mode 0644
+  files_mode 0o644

   purge true
 end
 
   purge true
 end
 


@@ -49,10 +51,10 @@ remote_directory "/var/lib/trac/templates" do
   source "templates"
   owner "trac"
   group "trac"
   source "templates"
   owner "trac"
   group "trac"

-  mode 0755
+  mode 0o755

   files_owner "trac"
   files_group "trac"
   files_owner "trac"
   files_group "trac"

-  files_mode 0644
+  files_mode 0o644

   purge true
 end
 
   purge true
 end
 


@@ -60,33 +62,38 @@ execute "trac-deploy-#{site_name}" do
   command "trac-admin /var/lib/trac deploy #{site_directory}"
   user "root"
   group "root"
   command "trac-admin /var/lib/trac deploy #{site_directory}"
   user "root"
   group "root"

-  not_if { File.exists?(site_directory) }
+  not_if { File.exist?(site_directory) }

 end
 
 cookbook_file "/usr/local/bin/trac-authenticate" do
   owner "root"
   group "root"
 end
 
 cookbook_file "/usr/local/bin/trac-authenticate" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 apache_module "wsgi"
 
 end
 
 apache_module "wsgi"
 

+ssl_certificate "trac.openstreetmap.org" do
+  domains ["trac.openstreetmap.org", "trac.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+

 apache_site site_name do
   template "apache.erb"
   directory site_directory
 apache_site site_name do
   template "apache.erb"
   directory site_directory

-  variables :user => "trac", :group => "trac"
+  variables :user => "trac", :group => "trac", :aliases => ["trac.osm.org"]

 end
 
 template "/etc/sudoers.d/trac" do
   source "sudoers.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/sudoers.d/trac" do
   source "sudoers.erb"
   owner "root"
   group "root"

-  mode 0440
+  mode 0o440

 end
 
 template "/etc/cron.daily/trac-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/cron.daily/trac-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 end