Merge pull request alphagov#4 from alphagov/ntp_reset

rjw1 · rjw1 · commit 52ccae26beb9 · 2013-08-28T03:06:02.000-07:00
Ntp reset
diff --git a/fabfile.py b/fabfile.py
@@ -15,6 +15,7 @@
 import licensify
 import mongo
 import nginx
+import ntp
 import puppet
 import rkhunter
 import search
diff --git a/ntp.py b/ntp.py
@@ -0,0 +1,17 @@
+from fabric.api import *
+
+@task
+def status():
+    """Report the VM's NTP status."""
+    run("/usr/lib/nagios/plugins/check_ntp_time -q -H ntp.ubuntu.com -w 2 -c 3")
+
+@task
+def resync():
+    """Forcibly resynchronise the VM's NTP clock.
+    
+    If a VM's clock manages to get sufficiently out of sync, ntp will give up,
+    forcing a manual intervention.
+    """
+    sudo("service ntp stop")
+    sudo("ntpdate ntp.ubuntu.com")
+    sudo("service ntp start")
