Merge pull request alphagov#139 from alphagov/bugfix-incident-fail-script

ajlanghorn · ajlanghorn · commit 216971cd1651 · 2015-06-19T17:12:49.000+01:00
Fix bug in `incident.fail_to_mirror`
diff --git a/incident.py b/incident.py
@@ -1,4 +1,5 @@
 from fabric.api import *
+from fabric.tasks import execute
 import nginx
 import puppet
 
@@ -7,8 +8,9 @@
 def fail_to_mirror():
     """Fails the site to the mirror by stopping nginx on the cache nodes"""
     puppet.disable("Fabric fail_to_mirror task invoked")
-    nginx_kill()
-    print("Disabled Puppet and www.gov.uk vhost, remember to re-enable and re-run puppet to restore previous state")
+    execute(nginx.kill)
+    print('Disabled Puppet and switched off Nginx.')
+    print('Run `incident.recover_origin` to start serving from origin again.')
 
 @task
 @roles('class-cache')
