From c7cc44d07524e4d35fba6a20cbdfe0d54b27f5fb Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 10 Feb 2017 14:45:12 +0000 Subject: [PATCH] Redirect developer and docs from HTTP to HTTPS Per discussion in the http://lists.openstack.org/pipermail/openstack-docs/2017-January/009545.html thread (continuing in http://lists.openstack.org/pipermail/openstack-docs/2017-February/009617.html the following month) we're ready to force all HTTP requests for developer.openstack.org and docs.openstack.org to permanently redirect to the HTTPS versions of the same pages. Change-Id: I8be8dcd628b957eab147f76c0c7c812433c4bb48 --- .../openstack_project/templates/developer.vhost.erb | 11 +---------- modules/openstack_project/templates/docs.vhost.erb | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/modules/openstack_project/templates/developer.vhost.erb b/modules/openstack_project/templates/developer.vhost.erb index fd322c8be8..b545ce5292 100644 --- a/modules/openstack_project/templates/developer.vhost.erb +++ b/modules/openstack_project/templates/developer.vhost.erb @@ -11,16 +11,7 @@ <% end -%> RewriteEngine on - - DocumentRoot <%= @docroot %> - > - Options Indexes FollowSymLinks MultiViews - Satisfy any - Require all granted - # Allow mod_rewrite rules - AllowOverride FileInfo - ErrorDocument 404 /errorpage.html - + RewriteRule ^/(.*) https://<%= @srvname %>/$1 [last,redirect=permanent] ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log LogLevel warn diff --git a/modules/openstack_project/templates/docs.vhost.erb b/modules/openstack_project/templates/docs.vhost.erb index 7c40781347..d36b0b32d9 100644 --- a/modules/openstack_project/templates/docs.vhost.erb +++ b/modules/openstack_project/templates/docs.vhost.erb @@ -11,16 +11,7 @@ <% end -%> RewriteEngine on - - DocumentRoot <%= @docroot %> - > - Options Indexes FollowSymLinks MultiViews - Satisfy any - Require all granted - # Allow mod_rewrite rules - AllowOverride FileInfo - ErrorDocument 404 /errorpage.html - + RewriteRule ^/(.*) https://<%= @srvname %>/$1 [last,redirect=permanent] ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log LogLevel warn