Commit338b449

committed

Selectively disablewww.gov.uk vhost and not assets vhost

1 parente83c0c7 commit338b449Copy full SHA for 338b449

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`fromfabric.apiimport*`
`2`		`-fromnginximportkillasnginx_kill`
`3`		`-frompuppetimportdisableaspuppet_disable`
	`2`	`+importnginx`
	`3`	`+importpuppet`
`4`	`4`
`5`	`5`	`@task`
`6`	`6`	`@roles('class-cache')`
`7`	`7`	`deffail_to_mirror():`
`8`	`8`	`"""Fails the site to the mirror"""`
`9`		`-puppet_disable()`
`10`		`-nginx_kill()`
`11`		`-print("Disabled Puppet and stopped Nginx, remember to re-enable these")`
	`9`	`+puppet.disable()`
	`10`	`+nginx.disable_vhost("www.gov.uk")`
	`11`	`+nginx.hello_it()`
	`12`	`+print("Disabled Puppet and disabled www.gov.uk vhost, remember to re-enable these")`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,11 @@ def gracefulstop(wait=True):`
`9`	`9`	`# Poll for Nginx, until it's no longer running.`
`10`	`10`	`run('while pgrep nginx >/dev/null; do echo "Waiting for Nginx to exit.."; sleep 1; done')`
`11`	`11`
	`12`	`+@task`
	`13`	`+defdisable_vhost(vhost_filename):`
	`14`	`+"""Disable a vhost by removing its symlink from /etc/nginx/sites-enabled"""`
	`15`	`+sudo('rm -f /etc/nginx/sites-enabled/%s'%vhost_filename)`
	`16`	`+`
`12`	`17`	`@task`
`13`	`18`	`defkill():`
`14`	`19`	`"""Shut down Nginx immediately without waiting for it to finish running"""`

Comments

(0)