Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/292309
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 M modules/toollabs/templates/toolschecker.upstart.erb 2 files changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/09/292309/1 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.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: newchange Gerrit-Change-Id: Icbec20414399731ec0dce15250fdaf65776be71c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits