Update piwik to 3.8.0

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index df4e76f43511f44f06d4f949ebc1401b78fbe099..5c4907b69c7805b98c78452a4f8c8fcb37cddeb8 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/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,


@@ -19,9 +19,6 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

-certificate = node[:tilecache][:ssl][:certificate]
-node.default[:ssl][:certificates] = node[:ssl][:certificates] | [certificate]
-

 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"
 include_recipe "ssl"
 include_recipe "squid"
 include_recipe "nginx"


@@ -30,8 +27,10 @@ package "apache2" do
   action :remove
 end
 
   action :remove
 end
 

-package "xz-utils"
-package "openssl"
+package %w[
+  xz-utils
+  openssl
+]

 
 # oathtool for QoS token
 package "oathtool"
 
 # oathtool for QoS token
 package "oathtool"


@@ -78,6 +77,8 @@ squid_fragment "tilecache" do
   variables :caches => tilecaches, :renders => tilerenders
 end
 
   variables :caches => tilecaches, :renders => tilerenders
 end
 

+package "rsync"
+

 template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"
 template "/etc/logrotate.d/squid" do
   source "logrotate.squid.erb"
   owner "root"


@@ -89,10 +90,6 @@ nginx_site "default" do
   action [:delete]
 end
 
   action [:delete]
 end
 

-resolvers = node[:networking][:nameservers].map do |resolver|
-  IPAddr.new(resolver).ipv6? ? "[#{resolver}]" : resolver
-end
-

 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"
 template "/usr/local/bin/nginx_generate_tilecache_qos_map" do
   source "nginx_generate_tilecache_qos_map.erb"
   owner "root"


@@ -114,17 +111,21 @@ execute "execute_nginx_generate_tilecache_qos_map" do
   action :run
 end
 
   action :run
 end
 

-nginx_site "tile-ssl" do
-  template "nginx_tile_ssl.conf.erb"
-  variables :certificate => certificate, :resolvers => resolvers, :caches => tilecaches
+ssl_certificate "tile.openstreetmap.org" do
+  domains ["tile.openstreetmap.org",
+           "a.tile.openstreetmap.org",
+           "b.tile.openstreetmap.org",
+           "c.tile.openstreetmap.org",
+           "tile.osm.org",
+           "a.tile.osm.org",
+           "b.tile.osm.org",
+           "c.tile.osm.org"]
+  notifies :restart, "service[nginx]"

 end
 
 end
 

-service "nginx-certificate-restart" do
-  service_name "nginx"
-  action :nothing
-  subscribes :restart, "cookbook_file[/etc/ssl/certs/rapidssl.pem]"
-  subscribes :restart, "file[/etc/ssl/certs/#{certificate}.pem]"
-  subscribes :restart, "file[/etc/ssl/private/#{certificate}.key]"
+nginx_site "tile" do
+  template "nginx_tile.conf.erb"
+  variables :caches => tilecaches

 end
 
 template "/etc/logrotate.d/nginx" do
 end
 
 template "/etc/logrotate.d/nginx" do