Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: T105080: add maintenance mode configs for nginx
......................................................................
T105080: add maintenance mode configs for nginx
Change-Id: I922b542ddacfd7a253092c86805322d3b8cb7250
---
M modules/wdqs/manifests/gui.pp
M modules/wdqs/templates/nginx.erb
2 files changed, 16 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wdqs/manifests/gui.pp b/modules/wdqs/manifests/gui.pp
index 8336625..bee2d42 100644
--- a/modules/wdqs/manifests/gui.pp
+++ b/modules/wdqs/manifests/gui.pp
@@ -24,4 +24,12 @@
proto => 'tcp',
port => '443',
}
+
+ # The directory for operator-controlled nginx flags
+ file { '/var/lib/nginx/wdqs/':
+ ensure => directory,
+ owner => 'root',
+ group => 'wikidev',
+ mode => '0775',
+ }
}
diff --git a/modules/wdqs/templates/nginx.erb b/modules/wdqs/templates/nginx.erb
index 4ed994a..b9553f1 100644
--- a/modules/wdqs/templates/nginx.erb
+++ b/modules/wdqs/templates/nginx.erb
@@ -9,6 +9,14 @@
listen 80 default_server;
listen [::]:80 default_server;
+ error_page 503 @maintenance;
+ location @maintenance {
+ root <%= @package_dir %>/gui;
+ rewrite ^(.*)$ /maint.html break;
+ }
+ if (-f /var/lib/nginx/wdqs/maintenance) {
+ return 503;
+ }
location / {
root <%= @package_dir %>/gui;
--
To view, visit https://gerrit.wikimedia.org/r/228140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I922b542ddacfd7a253092c86805322d3b8cb7250
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
