aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/websites
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2020-05-13 20:00:22 +0300
committerThomas Backlund <tmb@mageia.org>2020-05-13 20:00:22 +0300
commit0b2f23486980ceb3c8b7a1ca77bff7d06671e24c (patch)
treedc807639ac96f364377da296036d625bd4263e84 /deployment/websites
parent16077afc71a72b6444f42d9a927f1cff8fbe52fb (diff)
downloadpuppet-0b2f23486980ceb3c8b7a1ca77bff7d06671e24c.tar
puppet-0b2f23486980ceb3c8b7a1ca77bff7d06671e24c.tar.gz
puppet-0b2f23486980ceb3c8b7a1ca77bff7d06671e24c.tar.bz2
puppet-0b2f23486980ceb3c8b7a1ca77bff7d06671e24c.tar.xz
puppet-0b2f23486980ceb3c8b7a1ca77bff7d06671e24c.zip
fix switch to https
Diffstat (limited to 'deployment/websites')
-rw-r--r--deployment/websites/manifests/www.pp4
-rw-r--r--deployment/websites/templates/vhost_www.conf3
2 files changed, 3 insertions, 4 deletions
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index 07ee4ec4..c0c556ea 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -50,10 +50,6 @@ class websites::www {
options => ['FollowSymLinks'],
}
- apache::vhost_redirect { "${vhost}":
- url => "https://www.${::domain}/",
- }
-
apache::vhost_redirect { "${::domain}":
url => "https://www.${::domain}/",
}
diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf
index 1d60db0b..c7634759 100644
--- a/deployment/websites/templates/vhost_www.conf
+++ b/deployment/websites/templates/vhost_www.conf
@@ -7,3 +7,6 @@ RewriteRule ^g/(.+)$ https://static.mageia.org/g/$1 [R,L,QSA]
ErrorDocument 404 /404.php
php_value short_open_tag false
+
+# switch all to https
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]