Fix imager layer deletion

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

diff --git a/cookbooks/tilecache/recipes/default.rb b/cookbooks/tilecache/recipes/default.rb
index 395ee54dcdd8106240026b122447a12096c1fad5..f1bab2e574e8c92e36c27d2b44756506da5427ac 100644 (file)
--- a/cookbooks/tilecache/recipes/default.rb
+++ b/cookbooks/tilecache/recipes/default.rb
@@ -19,10 +19,11 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

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

 include_recipe "fail2ban"
 include_recipe "fail2ban"

+include_recipe "munin"
+include_recipe "nginx"
+include_recipe "squid"
+include_recipe "ssl"

 
 package "apache2" do
   action :remove
 
 package "apache2" do
   action :remove


@@ -100,25 +101,6 @@ squid_fragment "tilecache" do
   variables :caches => tilecaches, :renders => tilerenders
 end
 
   variables :caches => tilecaches, :renders => tilerenders
 end
 

-if node[:packages][:squid][:version].to_f < 4.9
-  Array(node[:squid][:cache_dir]).each do |cache_dir|
-    if cache_dir =~ /^coss (\S+) /
-      cache_dir = File.dirname(Regexp.last_match(1))
-    elsif cache_dir =~ /^\S+ (\S+) /
-      cache_dir = Regexp.last_match(1)
-    end
-
-    file "#{cache_dir}/rock" do
-      action :delete
-      backup false
-    end
-  end
-
-  package "squid" do
-    action :upgrade
-  end
-end
-

 package "rsync"
 
 template "/etc/logrotate.d/squid" do
 package "rsync"
 
 template "/etc/logrotate.d/squid" do


@@ -128,16 +110,6 @@ template "/etc/logrotate.d/squid" do
   mode 0o644
 end
 
   mode 0o644
 end
 

-# Configure cron with lower cpu and IO priority
-systemd_service "cron-load" do
-  service "cron"
-  dropin "load"
-  nice 19
-  io_scheduling_class "best-effort"
-  io_scheduling_priority 7
-  notifies :restart, "service[cron]"
-end
-

 nginx_site "default" do
   action [:delete]
 end
 nginx_site "default" do
   action [:delete]
 end