tilecache: restrict cache control headers to osm.org only

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

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index e5fd33d22604d6f85a418a2ef134077981cfcbb8..f487fa4d18cf87bedad1bcfd5882552ac89c06c0 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: serverinfo
+# Cookbook:: serverinfo

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "git"
 
 package "ruby"
 include_recipe "git"
 
 package "ruby"


@@ -38,7 +38,7 @@ roles = { :rows => search(:role, "*:*") }
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json

-  mode 0644
+  mode 0o644

   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"


@@ -46,14 +46,14 @@ end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json

-  mode 0644
+  mode 0o644

   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do

-  mode 0755
+  mode 0o755

   owner "nobody"
   group "nogroup"
 end
   owner "nobody"
   group "nogroup"
 end


@@ -66,7 +66,13 @@ execute "/srv/hardware.openstreetmap.org" do
   group "nogroup"
 end
 
   group "nogroup"
 end
 

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

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

+  variables :aliases => ["hardware.osm.org"]

 end
 end