Commitc59bedf

committed

Merge pull requestalphagov#133 from alphagov/stop_nginx_to_fail_to_mirror

Stop nginx to fail to mirror

2 parentsd0b0c01 +0afe100 commitc59bedfCopy full SHA for c59bedf

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,9 @@`
`5`	`5`	`@task`
`6`	`6`	`@roles('class-cache')`
`7`	`7`	`deffail_to_mirror():`
`8`		`-"""Fails the site to the mirror"""`
	`8`	`+"""Fails the site to the mirror by stopping nginx on the cache nodes"""`
`9`	`9`	`puppet.disable("Fabric fail_to_mirror task invoked")`
`10`		`-nginx.disable_vhost("www.gov.uk")`
`11`		`-nginx.force_restart()`
	`10`	`+nginx_kill()`
`12`	`11`	`print("Disabled Puppet and www.gov.uk vhost, remember to re-enable and re-run puppet to restore previous state")`
`13`	`12`
`14`	`13`	`@task`

Lines changed: 0 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,6 @@ def gracefulrestart():`
`15`	`15`	`gracefulstop()`
`16`	`16`	`start()`
`17`	`17`
`18`		`-@task`
`19`		`-defdisable_vhost(vhost_filename):`
`20`		`-"""Disable a vhost by removing its symlink from /etc/nginx/sites-enabled"""`
`21`		`-sudo('rm -f /etc/nginx/sites-enabled/%s'%vhost_filename)`
`22`		`-`
`23`	`18`	`@task`
`24`	`19`	`defkill():`
`25`	`20`	`"""Shut down Nginx immediately without waiting for it to finish running"""`

Comments

(0)