Teach munin to use internal addresses for Amsterdam machines

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

diff --git a/cookbooks/tools/recipes/default.rb b/cookbooks/tools/recipes/default.rb
index 99c03e2b9d5992f80070be94b9d0b8857b6cc3c3..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
 #
 # 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,


@@ -32,12 +32,15 @@ package %w[
   usbutils
   numactl
   xfsprogs
   usbutils
   numactl
   xfsprogs

-  sysv-rc-conf

   iotop
   lvm2
   rsyslog
 ]
 
   iotop
   lvm2
   rsyslog
 ]
 

+if node[:lsb][:release].to_f < 18.04
+  package "sysv-rc-conf"
+end
+

 service "rsyslog" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 service "rsyslog" do
   action [:enable, :start]
   supports :status => true, :restart => true, :reload => true