Use backport of cgi-mapserver

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

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index b0dc2bb9c8fff5114a81f92948bec61c672a1d53..d07ddcfe55e58bcec8bfb43c3706627d4b9f1da3 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: tools
+# Cookbook:: tools

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

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

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -19,23 +19,29 @@
 
 package %w[
   bash-completion
 
 package %w[
   bash-completion

+  cron
+  curl

   dmidecode
   ethtool
   dmidecode
   ethtool

+  iotop
+  iptraf-ng
+  locales-all

   lsof
   lsscsi
   lsof
   lsscsi

+  lvm2
+  mtr-tiny
+  numactl

   pciutils
   pciutils

+  rsyslog

   screen
   smartmontools
   strace
   sysstat
   screen
   smartmontools
   strace
   sysstat

+  systemd-coredump

   tcpdump
   usbutils
   tcpdump
   usbutils

-  numactl
+  vim

   xfsprogs
   xfsprogs

-  sysv-rc-conf
-  iotop
-  lvm2
-  rsyslog

 ]
 
 service "rsyslog" do
 ]
 
 service "rsyslog" do


@@ -43,12 +49,41 @@ service "rsyslog" do
   supports :status => true, :restart => true, :reload => true
 end
 
   supports :status => true, :restart => true, :reload => true
 end
 

-# Remove unused base package
-package "mlocate" do
+# Remove some unused and unwanted packages
+package %w[mlocate whoopsie] do

   action :purge
 end
 
   action :purge
 end
 

-# Remove ubuntu "desktop" vestigal package
-package "whoopsie" do
-  action :purge
+# Configure cron to run in the local timezone of the machine
+systemd_service "cron-timezone" do
+  service "cron"
+  dropin "timezone"
+  environment "TZ" => node[:timezone]
+  notifies :restart, "service[cron]"
+  only_if { node[:timezone] }
+end
+
+# Configure cron with lower cpu and IO priority
+if node[:tools][:cron][:load]
+  systemd_service "cron-load" do
+    service "cron"
+    dropin "load"
+    nice node[:tools][:cron][:load][:nice]
+    io_scheduling_class node[:tools][:cron][:load][:io_scheduling_class]
+    io_scheduling_priority node[:tools][:cron][:load][:io_scheduling_priority]
+    notifies :restart, "service[cron]"
+  end
+end
+
+# Make sure cron is running
+service "cron" do
+  action [:enable, :start]
+end
+
+# Ubuntu MOTD adverts be-gone
+template "/etc/default/motd-news" do
+  source "motd-news.erb"
+  owner "root"
+  group "root"
+  mode "644"

 end
 end