Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Various fixups for servermon.wikimedia.org
......................................................................
Various fixups for servermon.wikimedia.org
Require SSL
Fix the LDAP requires via a Location
Serve static files via apache
django debug false
Change-Id: If201792dd17e528632edc41438a40efe30167a6e
---
M modules/servermon/templates/settings.py.erb
M templates/apache/sites/servermon.wikimedia.org.erb
2 files changed, 18 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/servermon/templates/settings.py.erb
b/modules/servermon/templates/settings.py.erb
index 38531bc..dd05c35 100644
--- a/modules/servermon/templates/settings.py.erb
+++ b/modules/servermon/templates/settings.py.erb
@@ -3,7 +3,7 @@
from django.conf import global_settings
here = lambda x: os.path.join(os.path.abspath(os.path.dirname(__file__)), x)
-DEBUG = True
+DEBUG = False
TEMPLATE_DEBUG = DEBUG
ADMINS = (
diff --git a/templates/apache/sites/servermon.wikimedia.org.erb
b/templates/apache/sites/servermon.wikimedia.org.erb
index 944db38..d2114b3 100644
--- a/templates/apache/sites/servermon.wikimedia.org.erb
+++ b/templates/apache/sites/servermon.wikimedia.org.erb
@@ -26,9 +26,17 @@
DocumentRoot /srv/nonexistent
<Directory />
Options FollowSymLinks
+ SSLRequireSSL
AllowOverride None
- Order Allow,Deny
- Allow from all
+ Order Allow,Deny
+ Allow from All
+ </Directory>
+
+ <Location />
+ SSLRequireSSL
+ AllowOverride None
+ Order Allow,Deny
+ Allow from All
AuthName "WMF Labs (use wiki login name not shell)"
AuthType Basic
AuthBasicProvider ldap
@@ -47,8 +55,13 @@
# alert, emerg.
LogLevel warn
- ProxyPass / http://127.0.0.1:8090
- ProxyPassReverse / http://127.0.0.1:8090
+ Alias /media/ /usr/lib/python2.7/dist-packages/django/contrib/admin/media/
+ ProxyPass /media/ !
+ Alias /static/ /srv/deployment/servermon/servermon/servermon/static/
+ ProxyPass /static/ !
+
+ 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/159378
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If201792dd17e528632edc41438a40efe30167a6e
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
