Merge pull request alphagov#133 from alphagov/stop_nginx_to_fail_to_mirror

ajlanghorn · ajlanghorn · commit c59bedfbba65 · 2015-06-05T16:17:10.000+01:00
Stop nginx to fail to mirror
diff --git a/incident.py b/incident.py
@@ -5,10 +5,9 @@
 @task
 @roles('class-cache')
 def fail_to_mirror():
-    """Fails the site to the mirror"""
+    """Fails the site to the mirror by stopping nginx on the cache nodes"""
     puppet.disable("Fabric fail_to_mirror task invoked")
-    nginx.disable_vhost("www.gov.uk")
-    nginx.force_restart()
+    nginx_kill()
     print("Disabled Puppet and www.gov.uk vhost, remember to re-enable and re-run puppet to restore previous state")
 
 @task
diff --git a/nginx.py b/nginx.py
@@ -15,11 +15,6 @@ def gracefulrestart():
     gracefulstop()
     start()
 
-@task
-def disable_vhost(vhost_filename):
-    """Disable a vhost by removing its symlink from /etc/nginx/sites-enabled"""
-    sudo('rm -f /etc/nginx/sites-enabled/%s' % vhost_filename)
-
 @task
 def kill():
     """Shut down Nginx immediately without waiting for it to finish running"""
