Yuvipanda has submitted this change and it was merged.
Change subject: ores: Make uwsgi listen on http
......................................................................
ores: Make uwsgi listen on http
The uwsgi protocol is hard to debug
Change-Id: I488b2c09d56ac88a029d285f01b1a31600a230cd
---
M modules/ores/manifests/web.pp
M modules/ores/templates/lb.nginx.erb
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 0e1d54f..7080b98 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -68,7 +68,7 @@
'wsgi-file' => "${src_path}/ores.wsgi",
master => true,
chdir => $src_path,
- socket => '0.0.0.0:8080',
+ http-socket => '0.0.0.0:8080',
venv => '/srv/ores/venv',
processes => inline_template('<%= @processorcount.to_i * 2
%>'),
}
diff --git a/modules/ores/templates/lb.nginx.erb
b/modules/ores/templates/lb.nginx.erb
index f9f33af..0d0c882 100644
--- a/modules/ores/templates/lb.nginx.erb
+++ b/modules/ores/templates/lb.nginx.erb
@@ -9,8 +9,6 @@
listen 80;
location / {
- include uwsgi_params;
-
- uwsgi_pass oresweb;
+ proxy_pass oresweb;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I488b2c09d56ac88a029d285f01b1a31600a230cd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
