X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..b5977d65e97f6fcfccddefedf619de4902e45d31:/cookbooks/ntp/recipes/default.rb

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index d56804777..7be4ab437 100644
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -9,7 +9,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,
@@ -19,9 +19,11 @@
 
 require "socket"
 
-package "ntp"
-package "ntpdate"
-package "tzdata"
+package %w[
+  ntp
+  ntpdate
+  tzdata
+]
 
 execute "dpkg-reconfigure-tzdata" do
   action :nothing
@@ -30,16 +32,15 @@ execute "dpkg-reconfigure-tzdata" do
   group "root"
 end
 
-file "/etc/timezone" do
+link "/etc/localtime" do
+  to "/usr/share/zoneinfo/#{node[:tz]}"
   owner "root"
   group "root"
-  mode 0644
-  content "#{node[:tz]}\n"
-  notifies :run, resources(:execute => "dpkg-reconfigure-tzdata"), :immediately
+  notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately
 end
 
 service "ntp" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true
 end
 
@@ -47,41 +48,23 @@ template "/etc/ntp.conf" do
   source "ntp.conf.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :restart, resources(:service => "ntp")
+  mode 0o644
+  notifies :restart, "service[ntp]"
 end
 
-munin_plugins = []
+munin_plugins = %w[ntp_kernel_err ntp_kernel_pll_freq ntp_kernel_pll_off ntp_offset]
 
-if node[:lsb][:release].to_f <= 8.04
-  munin_plugins = [ "ntp_states" ]
-
-  node[:ntp][:servers].each do |name|
-    name = Socket.gethostbyname(name)[0].gsub!(/[.-]/, "_")
-
-    munin_plugin "ntp_#{name}" do
-      target "ntp_"
-    end
-
-    munin_plugins.push("ntp_#{name}")
-  end
-
-  munin_plugin "ntp_states"
-else
-  munin_plugins = [ "ntp_kernel_err", "ntp_kernel_pll_freq", "ntp_kernel_pll_off", "ntp_offset" ]
-
-  munin_plugin "ntp_kernel_err"
-  munin_plugin "ntp_kernel_pll_freq"
-  munin_plugin "ntp_kernel_pll_off"
-  munin_plugin "ntp_offset"
-end
+munin_plugin "ntp_kernel_err"
+munin_plugin "ntp_kernel_pll_freq"
+munin_plugin "ntp_kernel_pll_off"
+munin_plugin "ntp_offset"
 
 if File.directory?("/etc/munin/plugins")
   Dir.new("/etc/munin/plugins").each do |plugin|
-    if plugin.match(/^ntp_/) and not munin_plugins.include?(plugin)
-      munin_plugin plugin do
-        action :delete
-      end
+    next unless plugin.match(/^ntp_/) && !munin_plugins.include?(plugin)
+
+    munin_plugin plugin do
+      action :delete
     end
   end
 end