Merge remote-tracking branch 'github/pull/165'

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

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 432f0fd69ae915375b3b9f39cd1a28af63b7cfd4..a8afec012bc27d754e8d90826f59127b4f790bec 100644 (file)
--- a/cookbooks/tools/recipes/default.rb
+++ b/cookbooks/tools/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,
@@ -17,26 +17,41 @@
 # 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 %w[
+  bash-completion
+  dmidecode
+  ethtool
+  lsof
+  lsscsi
+  pciutils
+  screen
+  smartmontools
+  strace
+  sysstat
+  tcpdump
+  usbutils
+  numactl
+  xfsprogs
+  iotop
+  lvm2
+  rsyslog
+]
 
-if node[:lsb][:release].to_f >= 10.04
-  package "iotop"
+if node[:lsb][:release].to_f < 18.04
+  package "sysv-rc-conf"
 end
 
-if node[:lsb][:release].to_f <= 11.04
-  package "lslk"
+service "rsyslog" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+
+# Remove unused base package
+package "mlocate" do
+  action :purge
+end
+
+# Remove ubuntu "desktop" vestigal package
+package "whoopsie" do
+  action :purge
 end