deployment: switch to https://

6 files changed, 15 insertions, 15 deletions

diff --git a/deployment/websites/manifests/git.pp b/deployment/websites/manifests/git.pp
index 8e7a0058..a71de33f 100644
--- a/deployment/websites/manifests/git.pp
+++ b/deployment/websites/manifests/git.pp
@@ -1,5 +1,5 @@
 class websites::git {
     apache::vhost_redirect { "git.${::domain}":
-        url => "http://gitweb.${::domain}/",
+        url => "https://gitweb.${::domain}/",
     }
 }
diff --git a/deployment/websites/manifests/start.pp b/deployment/websites/manifests/start.pp
index ed0d4adb..0db6dec1 100644
--- a/deployment/websites/manifests/start.pp
+++ b/deployment/websites/manifests/start.pp
@@ -1,6 +1,6 @@
 class websites::start {
     include websites::base
     apache::vhost_redirect { "start.${::domain}":
-        url => "http://www.${::domain}/community/",
+        url => "https://www.${::domain}/community/",
     }
 }
diff --git a/deployment/websites/manifests/svn.pp b/deployment/websites/manifests/svn.pp
index d8e87f64..ad49f69e 100644
--- a/deployment/websites/manifests/svn.pp
+++ b/deployment/websites/manifests/svn.pp
@@ -1,5 +1,5 @@
 class websites::svn {
     apache::vhost_redirect { "svn.${::domain}":
-        url => "http://svnweb.${::domain}/",
+        url => "https://svnweb.${::domain}/",
     }
 }
diff --git a/deployment/websites/manifests/www.pp b/deployment/websites/manifests/www.pp
index ecff73e6..c0c556ea 100644
--- a/deployment/websites/manifests/www.pp
+++ b/deployment/websites/manifests/www.pp
@@ -51,7 +51,7 @@ class websites::www {
     }
 
     apache::vhost_redirect { "${::domain}":
-        url => "http://www.${::domain}/",
+        url => "https://www.${::domain}/",
     }
 
     apache::vhost_redirect { "ssl_${::domain}":
diff --git a/deployment/websites/templates/vhost_www.conf b/deployment/websites/templates/vhost_www.conf
index a28e7309..1d60db0b 100644
--- a/deployment/websites/templates/vhost_www.conf
+++ b/deployment/websites/templates/vhost_www.conf
@@ -2,7 +2,7 @@ Redirect /wiki https://wiki.mageia.org/#
 
 # Everything under /g/ is static content to be served by a seconday host
 RewriteEngine On
-RewriteRule ^g/(.+)$    http://static.mageia.org/g/$1 [R,L,QSA]
+RewriteRule ^g/(.+)$    https://static.mageia.org/g/$1 [R,L,QSA]
 
 ErrorDocument 404 /404.php
 
diff --git a/deployment/websites/templates/vhost_www_rewrite.conf b/deployment/websites/templates/vhost_www_rewrite.conf
index f1fa607e..c7bb2fd5 100644
--- a/deployment/websites/templates/vhost_www_rewrite.conf
+++ b/deployment/websites/templates/vhost_www_rewrite.conf
@@ -10,13 +10,13 @@ RewriteRule ^/mailman/listinfo/mageia-sysadm https://ml.mageia.org/l/info/sysadm
 RewriteRule ^/mailman/listinfo/mageia-webteam https://ml.mageia.org/l/info/atelier-discuss [R=301,L]
 RewriteRule ^/mailman https://ml.mageia.org/ [R=301,L]
 
-RewriteRule ^/pipermail/mageia-announce/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-announce/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-artwork/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-artwork/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-bugsquad/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-bugsquad/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-dev/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-dev/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-discuss/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-discuss/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-i18n/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-i18n/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-marketing/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-marketing/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-sysadm/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-sysadm/$1 [R=301,L]
-RewriteRule ^/pipermail/mageia-webteam/?(.*)$ http://archives.mageia.org/zarb-ml/mageia-webteam/$1 [R=301,L]
-RewriteRule ^/pipermail http://archives.mageia.org/zarb-ml/ [R=301,L]
+RewriteRule ^/pipermail/mageia-announce/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-announce/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-artwork/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-artwork/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-bugsquad/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-bugsquad/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-dev/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-dev/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-discuss/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-discuss/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-i18n/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-i18n/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-marketing/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-marketing/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-sysadm/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-sysadm/$1 [R=301,L]
+RewriteRule ^/pipermail/mageia-webteam/?(.*)$ https://archives.mageia.org/zarb-ml/mageia-webteam/$1 [R=301,L]
+RewriteRule ^/pipermail https://archives.mageia.org/zarb-ml/ [R=301,L]