Yuvipanda has submitted this change and it was merged.
Change subject: tools: Do not use nginx proxy for toolschecker
......................................................................
tools: Do not use nginx proxy for toolschecker
It isn't really doing much useful, is just proxying things
directly back to the uwsgi. Getting rid of it simplifies
reasoning about timeouts.
Bug: T136775
Change-Id: Icbec20414399731ec0dce15250fdaf65776be71c
---
M modules/toollabs/manifests/checker.pp
D modules/toollabs/templates/toolschecker.nginx.erb
M modules/toollabs/templates/toolschecker.upstart.erb
3 files changed, 1 insertion(+), 20 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/toollabs/manifests/checker.pp
b/modules/toollabs/manifests/checker.pp
index a9ac7dd..7239b01 100644
--- a/modules/toollabs/manifests/checker.pp
+++ b/modules/toollabs/manifests/checker.pp
@@ -85,10 +85,4 @@
ensure => running,
require => File['/run/toolschecker'],
}
-
-
- nginx::site { 'toolschecker-nginx':
- require => Service['toolschecker'],
- content => template('toollabs/toolschecker.nginx.erb'),
- }
}
diff --git a/modules/toollabs/templates/toolschecker.nginx.erb
b/modules/toollabs/templates/toolschecker.nginx.erb
deleted file mode 100644
index 3f49c76..0000000
--- a/modules/toollabs/templates/toolschecker.nginx.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-upstream toolschecker {
- server unix:/run/toolschecker/toolschecker.sock;
-}
-
-server {
- listen 80;
-
- location / {
- include uwsgi_params;
- uwsgi_pass toolschecker;
- }
-}
diff --git a/modules/toollabs/templates/toolschecker.upstart.erb
b/modules/toollabs/templates/toolschecker.upstart.erb
index bdbf453..d103073 100644
--- a/modules/toollabs/templates/toolschecker.upstart.erb
+++ b/modules/toollabs/templates/toolschecker.upstart.erb
@@ -17,8 +17,7 @@
--harakiri-verbose \
--wsgi-file=/usr/local/lib/python2.7/dist-packages/toolschecker.py \
--callable=app \
- --socket=/run/toolschecker/toolschecker.sock \
- --chmod-socket=664 \
+ --http-socket=0.0.0.0:80 \
--die-on-term
respawn
--
To view, visit https://gerrit.wikimedia.org/r/292309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbec20414399731ec0dce15250fdaf65776be71c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
