Make munin use the node name instead of the FQDN

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

diff --git a/cookbooks/trac/recipes/default.rb b/cookbooks/trac/recipes/default.rb
index a26cc7d27319efc27d9c2540bee6768e80893783..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,


@@ -74,14 +74,14 @@ end
 apache_module "wsgi"
 
 ssl_certificate "trac.openstreetmap.org" do
 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
   template "apache.erb"
   directory site_directory
   notifies :reload, "service[apache2]"
 end
 
 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
 end
 
 template "/etc/sudoers.d/trac" do