Convert more URLs to https

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

diff --git a/cookbooks/stats/recipes/default.rb b/cookbooks/stats/recipes/default.rb
index a0b81bb40390663ba7dd2825e5979de7419ae318..b2b1bffe8b29d20592ed4d91f394622a31008159 100644 (file)
--- a/cookbooks/stats/recipes/default.rb
+++ b/cookbooks/stats/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,


@@ -27,7 +27,7 @@ node[:stats][:sites].each do |site|
     source "awstats.conf.erb"
     owner "root"
     group "root"
     source "awstats.conf.erb"
     owner "root"
     group "root"

-    mode 0644
+    mode 0o644

     variables :site => site
   end
 end
     variables :site => site
   end
 end


@@ -36,37 +36,48 @@ template "/etc/cron.d/awstats" do
   source "awstats.cron.erb"
   owner "root"
   group "root"
   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"
   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"
 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"
 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"
 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
 
   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"]
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "stats.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/stats.openstreetmap.org"
 apache_site "stats.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/stats.openstreetmap.org"