Andrew Bogott has submitted this change and it was merged.
Change subject: Require https for horizon
......................................................................
Require https for horizon
Change-Id: I2eca68ed9bbc9db3936d0aab358e98a07f6bd5fc
---
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/templates/icehouse/horizon/openstack-dashboard.conf.erb
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index e9647cd..49044b6 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -16,6 +16,7 @@
}
include apache::mod::wsgi
+ include ::apache::mod::rewrite
if !defined(Class['memcached']) {
class { 'memcached':
diff --git
a/modules/openstack/templates/icehouse/horizon/openstack-dashboard.conf.erb
b/modules/openstack/templates/icehouse/horizon/openstack-dashboard.conf.erb
index fbb9357..3e5196d 100755
--- a/modules/openstack/templates/icehouse/horizon/openstack-dashboard.conf.erb
+++ b/modules/openstack/templates/icehouse/horizon/openstack-dashboard.conf.erb
@@ -1,3 +1,7 @@
+RewriteEngine On
+RewriteCond %{HTTPS} !=on
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+
WSGIScriptAlias /
/usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10
WSGIProcessGroup horizon
--
To view, visit https://gerrit.wikimedia.org/r/194951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2eca68ed9bbc9db3936d0aab358e98a07f6bd5fc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
