X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5c5ffa21ddcce610d5bbf7b3885b08497e85dac4..0d8030b3a7ec9eaa6bc96c7dd39d835a00a7ace0:/cookbooks/ntp/recipes/default.rb?ds=inline diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb index 938aa47ac..ff5a40ae7 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, @@ -17,11 +17,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -require "socket" - -package "ntp" -package "ntpdate" -package "tzdata" +package %w[ + chrony + tzdata +] execute "dpkg-reconfigure-tzdata" do action :nothing @@ -30,40 +29,27 @@ execute "dpkg-reconfigure-tzdata" do group "root" end -file "/etc/timezone" do +link "/etc/localtime" do + to "/usr/share/zoneinfo/#{node[:ntp][:tz]}" owner "root" group "root" - mode 0644 - content "#{node[:tz]}\n" - notifies :run, resources(:execute => "dpkg-reconfigure-tzdata"), :immediately -end - -service "ntp" do - action [ :enable, :start ] - supports :status => true, :restart => true + notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately end -template "/etc/ntp.conf" do - source "ntp.conf.erb" +template "/etc/chrony/chrony.conf" do + source "chrony.conf.erb" owner "root" group "root" - mode 0644 - notifies :restart, resources(:service => "ntp") + mode 0o644 + notifies :restart, "service[chrony]" end -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" +service "systemd-timesyncd" do + action [:stop, :disable] +end -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 - end - end +service "chrony" do + action [:enable, :start] end + +munin_plugin "chrony"