Enable SSL for stats.osm.org

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

diff --git a/cookbooks/stats/recipes/default.rb b/cookbooks/stats/recipes/default.rb
index a0b81bb40390663ba7dd2825e5979de7419ae318..3f0303d2ef4b1a7baaa92fad26b36fad2382d36a 100644 (file)
--- a/cookbooks/stats/recipes/default.rb
+++ b/cookbooks/stats/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
+include_recipe "apache::ssl"
 
 package "awstats"
 package "libgeo-ipfree-perl"
@@ -27,7 +27,7 @@ node[:stats][:sites].each do |site|
     source "awstats.conf.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :site => site
   end
 end
@@ -36,37 +36,49 @@ template "/etc/cron.d/awstats" do
   source "awstats.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :sites => node[:stats][:sites]
 end
 
 cookbook_file "/usr/local/bin/repack-archived-logs" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/cron.d/repack-archived-logs" do
   source "repack.cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end
 
 directory "/srv/stats.openstreetmap.org" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/srv/stats.openstreetmap.org/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
-  mode 644
+  mode 0o644
   variables :sites => node[:stats][:sites]
 end
 
+cookbook_file "/srv/stats.openstreetmap.org/robots.txt" do
+  owner "root"
+  group "root"
+  mode 0o644
+end
+
+ssl_certificate "stats.openstreetmap.org" do
+  domains ["stats.openstreetmap.org", "stats.osm.org"]
+  fallback_certificate "openstreetmap"
+  notifies :reload, "service[apache2]"
+end
+
 apache_site "stats.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/stats.openstreetmap.org"