diff options
| author | Thomas Backlund <tmb@mageia.org> | 2018-09-04 22:52:09 +0259 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2018-09-04 22:52:09 +0259 |
| commit | 365d70d8ecc93b528a6085a2a37568bb6291109d (patch) | |
| tree | 12399b0308570efd91258fe8f7b66a05cbf99715 /deployment/websites/templates | |
| parent | ccae161f5328c16afd5cd21477d705ef14b5aebd (diff) | |
| download | puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar.gz puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar.bz2 puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.tar.xz puppet-365d70d8ecc93b528a6085a2a37568bb6291109d.zip | |
deployment: switch to https://
Diffstat (limited to 'deployment/websites/templates')
| -rw-r--r-- | deployment/websites/templates/vhost_www.conf | 2 | ||||
| -rw-r--r-- | deployment/websites/templates/vhost_www_rewrite.conf | 20 |
2 files changed, 11 insertions, 11 deletions
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] |