X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7609b4c7dadb461d16c7c14f18e78782a19ea13d..d5c4026bf1afc48c3777d354efba6f8fad7581ec:/cookbooks/tools/recipes/default.rb

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 45fc074a4..99c03e2b9 100644
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/recipes/default.rb
@@ -17,30 +17,38 @@
 # limitations under the License.
 #
 
-package "bash-completion"
-package "dmidecode"
-package "ethtool"
-package "lsof"
-package "lsscsi"
-package "pciutils"
-package "screen"
-package "smartmontools"
-package "strace"
-package "sysstat"
-package "tcpdump"
-package "usbutils"
-package "numactl"
-package "xfsprogs"
-package "sysv-rc-conf"
-package "iotop"
+package %w[
+  bash-completion
+  dmidecode
+  ethtool
+  lsof
+  lsscsi
+  pciutils
+  screen
+  smartmontools
+  strace
+  sysstat
+  tcpdump
+  usbutils
+  numactl
+  xfsprogs
+  sysv-rc-conf
+  iotop
+  lvm2
+  rsyslog
+]
 
-if node[:lsb][:release].to_f <= 11.04
-  package "lslk"
+service "rsyslog" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
 end
 
-package "rsyslog"
+# Remove unused base package
+package "mlocate" do
+  action :purge
+end
 
-service "rsyslog" do
-  action [ :enable, :start ]
-  supports :status => true, :restart => true, :reload => true
+# Remove ubuntu "desktop" vestigal package
+package "whoopsie" do
+  action :purge
 end