Use https instead of http for some redirects

diff --git a/modules/roles/files/bugs_mirror/bugs-mirror.debian.org b/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
index 42b3ae9..e115240 100644 (file)
--- a/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
+++ b/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
@@ -16,6 +16,6 @@
                UserDir disabled
        </IfModule>
 
-       Redirect permanent / http://bugs.debian.org/
+       Redirect permanent / https://bugs.debian.org/
 </VirtualHost>
 # vim:set syn=apache:

diff --git a/modules/roles/templates/apache-www.debian.org.erb b/modules/roles/templates/apache-www.debian.org.erb
index 8e3416d..2ae810a 100644 (file)
--- a/modules/roles/templates/apache-www.debian.org.erb
+++ b/modules/roles/templates/apache-www.debian.org.erb
@@ -145,9 +145,9 @@
    RedirectPermanent /Packages https://packages.debian.org
    RedirectPermanent /lintian https://lintian.debian.org
 
-   RedirectPermanent /SPI http://www.spi-inc.org
+   RedirectPermanent /SPI https://www.spi-inc.org
 #   RedirectPermanent /OpenHardware http://www.openhardware.org
-   RedirectPermanent /OpenSource http://www.opensource.org
+   RedirectPermanent /OpenSource https://opensource.org
 
    RedirectPermanent /Bugs/db/ix/pseudopackages.html /Bugs/pseudo-packages
    RewriteEngine on
@@ -221,7 +221,7 @@
 
    RewriteRule ^/ports/freebsd(.*) /ports/kfreebsd-gnu/ [R=301]
    RewriteRule ^/devel/debian-installer/report-template(.*) /releases/stable/i386/ch05s04.html#submit-bug [NE,R=301]
-   RewriteRule ^/devel/debian-installer/hooks(.*) http://d-i.alioth.debian.org/doc/internals/apb.html [R=301]
+   RewriteRule ^/devel/debian-installer/hooks(.*) https://d-i.alioth.debian.org/doc/internals/apb.html [R=301]
    RewriteRule ^/doc/packaging-manuals/mime-policy(.*) /doc/debian-policy/ch-opersys.html#s-mime [NE,R=301]
 
    RewriteRule ^/volatile/index.* - [S=1]

diff --git a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
index 1dd2353..e0289be 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
+++ b/modules/roles/templates/static-mirroring/vhost/planet.debian.org.erb
@@ -28,9 +28,9 @@
 
        RewriteEngine On
        RewriteCond %{HTTP_HOST} ^planeta.debian.net$ [NC]
-       RewriteRule ^/(.*)        http://planet.debian.org/es/$1  [R=permanent,L]
+       RewriteRule ^/(.*)        https://planet.debian.org/es/$1  [R=permanent,L]
        RewriteCond %{HTTP_HOST} ^planet.debian.net$ [NC]
-       RewriteRule ^/(.*)        http://planet.debian.org/$1  [R=permanent,L]
+       RewriteRule ^/(.*)        https://planet.debian.org/$1  [R=permanent,L]
 </VirtualHost>
 
 <VirtualHost <%= @vhost_listen_443 %> >

diff --git a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
index 42759a3..dedb069 100644 (file)
--- a/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
+++ b/modules/roles/templates/static-mirroring/vhost/static-vhosts-simple.erb
@@ -250,7 +250,7 @@ lines.join("\n")
        ServerName www.backports.org
        ServerAlias lists.backports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent / http://backports.debian.org/
+       RedirectPermanent / https://backports.debian.org/
 </VirtualHost>
 
 ######################
@@ -277,7 +277,7 @@ lines.join("\n")
 <VirtualHost <%= @vhost_listen %> >
        ServerName ftp.debian-ports.org
        ServerAdmin debian-admin@debian.org
-       RedirectPermanent /archive http://www.ports.debian.org
+       RedirectPermanent /archive https://www.ports.debian.org
        RedirectPermanent /debian http://ftp.ports.debian.org/debian-ports
        RedirectPermanent /debian-cd https://cdimage.debian.org/cdimage/ports/
        RedirectPermanent / http://ftp.ports.debian.org/