From 0b2f23486980ceb3c8b7a1ca77bff7d06671e24c Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Wed, 13 May 2020 20:00:22 +0300
Subject: fix switch to https

---
 deployment/websites/manifests/www.pp         | 4 ----
 deployment/websites/templates/vhost_www.conf | 3 +++
 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]
-- 
cgit v1.2.1