Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Fixups for servermon
......................................................................
Fixups for servermon
* Need auth_basic, authnz_ldap module
* Bind gunicorn to localhost v4
Change-Id: Id248f161967f72d0be36e366c1ec4b1aa7f7731f
---
M manifests/role/servermon.pp
M modules/servermon/templates/gunicorn.erb
M templates/apache/sites/servermon.wikimedia.org.erb
3 files changed, 5 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/servermon.pp b/manifests/role/servermon.pp
index f746c48..ff2c04d 100644
--- a/manifests/role/servermon.pp
+++ b/manifests/role/servermon.pp
@@ -18,6 +18,8 @@
include ::apache::mod::proxy
include ::apache::mod::rewrite
include ::apache::mod::ssl
+ include ::apache::mod::auth_basic
+ include ::apache::mod::authnz_ldap
include passwords::servermon
$db_user = $passwords::servermon::db_user
diff --git a/modules/servermon/templates/gunicorn.erb
b/modules/servermon/templates/gunicorn.erb
index 9371ae1..c47123d 100644
--- a/modules/servermon/templates/gunicorn.erb
+++ b/modules/servermon/templates/gunicorn.erb
@@ -2,7 +2,7 @@
'mode': 'django',
'working_dir': '<%= @directory %>',
'args': (
- '--bind=0.0.0.0:<%= @port %>',
+ '--bind=127.0.0.1:<%= @port %>',
'--workers=4',
'--timeout=10',
),
diff --git a/templates/apache/sites/servermon.wikimedia.org.erb
b/templates/apache/sites/servermon.wikimedia.org.erb
index 873ef05..944db38 100644
--- a/templates/apache/sites/servermon.wikimedia.org.erb
+++ b/templates/apache/sites/servermon.wikimedia.org.erb
@@ -47,8 +47,8 @@
# alert, emerg.
LogLevel warn
- ProxyPass / http://localhost:8090
- ProxyPassReverse / http://localhost:8090
+ ProxyPass / http://127.0.0.1:8090
+ ProxyPassReverse / http://127.0.0.1:8090
CustomLog /var/log/apache2/servermon.wikimedia.org-access.log combined
ServerSignature On
--
To view, visit https://gerrit.wikimedia.org/r/159321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id248f161967f72d0be36e366c1ec4b1aa7f7731f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
