Remove attempt to force geodns rebuilds with --assume-new

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

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 0cd8dea24ae0eba23629a1a2ca16b3deeb812cc6..1f875cdcc83e6a41af8ce0516a42c27c4ab6bf5c 100644 (file)
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -1,9 +1,9 @@
 #
-# Cookbook Name:: ntp
+# Cookbook:: ntp
 # Recipe:: default
 #
-# Copyright 2010, OpenStreetMap Foundation.
-# Copyright 2009, Opscode, Inc
+# Copyright:: 2010, OpenStreetMap Foundation.
+# Copyright:: 2009, Opscode, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,27 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-service "ntp" do
-  action [:stop, :disable]
-end
-
-package "ntp" do
-  action :purge
-end
-
-package "ntpdate" do
-  action :purge
-end
-
-if File.directory?("/etc/munin/plugins")
-  Dir.new("/etc/munin/plugins").each do |plugin|
-    next unless plugin.match?(/^ntp_/)
-
-    munin_plugin plugin do
-      action :delete
-    end
-  end
-end
+include_recipe "munin"
 
 package %w[
   chrony
@@ -66,6 +46,17 @@ template "/etc/chrony/chrony.conf" do
   notifies :restart, "service[chrony]"
 end
 
+service "systemd-timesyncd" do
+  action [:stop, :disable]
+end
+
+systemd_service "chrony-restart" do
+  service "chrony"
+  dropin "restart"
+  restart "on-failure"
+  notifies :restart, "service[chrony]"
+end
+
 service "chrony" do
   action [:enable, :start]
 end