[MediaWiki-commits] [Gerrit] operations/puppet[production]: dynamicproxy: Fix health check endpoint location

2016-10-26 Thread Madhuvishy (Code Review) 
Madhuvishy has submitted this change and it was merged.

Change subject: dynamicproxy: Fix health check endpoint location
..


dynamicproxy: Fix health check endpoint location

Bug: T143638
Change-Id: I0705074e38fafb3d374901101f68378bb0e4d1a8
---
M modules/dynamicproxy/templates/domainproxy.conf
M modules/dynamicproxy/templates/nginx.conf
M modules/dynamicproxy/templates/urlproxy.conf
3 files changed, 8 insertions(+), 5 deletions(-)

Approvals:
  Madhuvishy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/dynamicproxy/templates/domainproxy.conf 
b/modules/dynamicproxy/templates/domainproxy.conf
index 327c041..a220a91 100644
--- a/modules/dynamicproxy/templates/domainproxy.conf
+++ b/modules/dynamicproxy/templates/domainproxy.conf
@@ -99,6 +99,10 @@
 <%- end -%>
 }
 
+location /.well-known/healthz {
+return 200 'proxy ok!';
+}
+
 # GZIP (ALMOST) ALL THE THINGS!
 gzip on;
 gzip_proxied any;
diff --git a/modules/dynamicproxy/templates/nginx.conf 
b/modules/dynamicproxy/templates/nginx.conf
index 02250a8..c4c8282 100644
--- a/modules/dynamicproxy/templates/nginx.conf
+++ b/modules/dynamicproxy/templates/nginx.conf
@@ -66,9 +66,4 @@
   include /etc/nginx/conf.d/*.conf;
   include /etc/nginx/sites-enabled/*;
 
-  server {
-location /.well-known/healthz {
-  return 200 'proxy ok!';
-}
-  }
 }
diff --git a/modules/dynamicproxy/templates/urlproxy.conf 
b/modules/dynamicproxy/templates/urlproxy.conf
index 76e5e3b..5aa24c3 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -95,6 +95,10 @@
 # We just want to protect downstream users who might be
 proxy_set_header Proxy "";
 
+location /.well-known/healthz {
+return 200 'proxy ok!';
+}
+
 location /.error/ {
 alias /var/www/error/;
 default_type text/html;

-- 
To view, visit https://gerrit.wikimedia.org/r/318226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0705074e38fafb3d374901101f68378bb0e4d1a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: dynamicproxy: Fix health check endpoint location

2016-10-26 Thread Madhuvishy (Code Review) 
Madhuvishy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/318226

Change subject: dynamicproxy: Fix health check endpoint location
..

dynamicproxy: Fix health check endpoint location

Bug: T143638
Change-Id: I0705074e38fafb3d374901101f68378bb0e4d1a8
---
M modules/dynamicproxy/templates/domainproxy.conf
M modules/dynamicproxy/templates/nginx.conf
M modules/dynamicproxy/templates/urlproxy.conf
3 files changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/318226/1

diff --git a/modules/dynamicproxy/templates/domainproxy.conf 
b/modules/dynamicproxy/templates/domainproxy.conf
index 327c041..a220a91 100644
--- a/modules/dynamicproxy/templates/domainproxy.conf
+++ b/modules/dynamicproxy/templates/domainproxy.conf
@@ -99,6 +99,10 @@
 <%- end -%>
 }
 
+location /.well-known/healthz {
+return 200 'proxy ok!';
+}
+
 # GZIP (ALMOST) ALL THE THINGS!
 gzip on;
 gzip_proxied any;
diff --git a/modules/dynamicproxy/templates/nginx.conf 
b/modules/dynamicproxy/templates/nginx.conf
index 02250a8..c4c8282 100644
--- a/modules/dynamicproxy/templates/nginx.conf
+++ b/modules/dynamicproxy/templates/nginx.conf
@@ -66,9 +66,4 @@
   include /etc/nginx/conf.d/*.conf;
   include /etc/nginx/sites-enabled/*;
 
-  server {
-location /.well-known/healthz {
-  return 200 'proxy ok!';
-}
-  }
 }
diff --git a/modules/dynamicproxy/templates/urlproxy.conf 
b/modules/dynamicproxy/templates/urlproxy.conf
index 76e5e3b..5aa24c3 100644
--- a/modules/dynamicproxy/templates/urlproxy.conf
+++ b/modules/dynamicproxy/templates/urlproxy.conf
@@ -95,6 +95,10 @@
 # We just want to protect downstream users who might be
 proxy_set_header Proxy "";
 
+location /.well-known/healthz {
+return 200 'proxy ok!';
+}
+
 location /.error/ {
 alias /var/www/error/;
 default_type text/html;

-- 
To view, visit https://gerrit.wikimedia.org/r/318226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0705074e38fafb3d374901101f68378bb0e4d1a8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Madhuvishy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits