Teach dns cookbook about site aliases

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

diff --git a/cookbooks/dns/recipes/default.rb b/cookbooks/dns/recipes/default.rb
index 768ad711b248511d457d18c81990f9e2345ed6c1..a78d1d5fc952e583d924c30377fbec368f7a1e86 100644 (file)
--- a/cookbooks/dns/recipes/default.rb
+++ b/cookbooks/dns/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
 #
-#     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,
@@ -22,32 +22,33 @@ include_recipe "apache"
 
 passwords = data_bag_item("dns", "passwords")
 
-package "make"
-
-package "perl"
-package "libxml-treebuilder-perl"
-package "libxml-writer-perl"
-package "libyaml-perl"
-package "libwww-perl"
-package "libjson-xs-perl"
+package %w[
+  make
+  perl
+  libxml-treebuilder-perl
+  libxml-writer-perl
+  libyaml-perl
+  libwww-perl
+  libjson-xs-perl
+]
 
 directory "/srv/dns.openstreetmap.org" do
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 remote_directory "/srv/dns.openstreetmap.org/html" do
   source "html"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
   files_owner "root"
   files_group "root"
-  files_mode 0644
+  files_mode 0o644
 end
 
-zones = Array.new
+zones = []
 
 Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
   zone = File.basename(kmlfile, ".json")
@@ -56,7 +57,7 @@ Dir.glob("/var/lib/dns/json/*.json").each do |kmlfile|
     source "zone.html.erb"
     owner "root"
     group "root"
-    mode 0644
+    mode 0o644
     variables :zone => zone
   end
 
@@ -67,20 +68,26 @@ template "/srv/dns.openstreetmap.org/html/index.html" do
   source "index.html.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   variables :zones => zones
 end
 
-apache_site "dns.openstreetmap.org" do 
+ssl_certificate "dns.openstreetmap.org" do
+  domains ["dns.openstreetmap.org", "dns.osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
+apache_site "dns.openstreetmap.org" do
   template "apache.erb"
   directory "/srv/dns.openstreetmap.org"
+  variables :aliases => ["dns.osm.org"]
 end
 
 template "/usr/local/bin/dns-update" do
   source "dns-update.erb"
   owner "root"
   group "git"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
 
@@ -94,7 +101,7 @@ end
 directory "/var/lib/dns" do
   owner "git"
   group "git"
-  mode 02775
+  mode 0o2775
   notifies :run, "execute[dns-update]"
 end
 
@@ -102,14 +109,14 @@ cookbook_file "#{node[:dns][:repository]}/hooks/post-receive" do
   source "post-receive"
   owner "git"
   group "git"
-  mode 0750
+  mode 0o750
 end
 
 template "/usr/local/bin/dns-check" do
   source "dns-check.erb"
   owner "root"
   group "git"
-  mode 0750
+  mode 0o750
   variables :passwords => passwords
 end
 
@@ -117,5 +124,5 @@ template "/etc/cron.d/dns" do
   source "cron.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end