Fix a bunch of broken http->https redirects and make them always temporary

roles/blog/templates/etc_apache2_sites-available_blog.j2

@@ -2,7 +2,7 @@
     ServerName {{ item.name }}
     ServerAlias www.{{ item.name }}
 
-    Redirect permanent / https://{{ item.name }}/
+    Redirect temp / https://www.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>

roles/blog/templates/etc_apache2_sites-available_fathom.j2

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName fathom.{{ item.name }}
 
-    Redirect permanent / https://{{ item.name }}/
+    Redirect temp / https://fathom.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>

roles/gitea/templates/etc_apache2_sites-available_gitea.j2

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName {{ gitea_subdomain }}.{{ item.name }}
 
-    Redirect permanent / https://{{ item.name }}/
+    Redirect temp / https://{{ gitea_subdomain }}.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>

roles/mailserver/templates/etc_apache2_sites-available_autoconfig.j2

@@ -1,15 +1,14 @@
 <VirtualHost *:80>
     ServerName {{ mail_server_autoconfig_hostname }}
 
-    Redirect permanent / https://{{ mail_server_autoconfig_hostname }}/
+    Redirect temp / https://{{ mail_server_autoconfig_hostname }}/
 </VirtualHost>
 
 <VirtualHost *:443>
     ServerName {{ mail_server_autoconfig_hostname }}
-    SSLEngine On
 
+    SSLEngine               On
     DocumentRoot            "/var/www/autoconfig"
     Options                 -Indexes
-
     HostnameLookups         Off
 </VirtualHost>

roles/matrix/templates/etc_apache2_sites-available_matrix.j2

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName {{ matrix_subdomain }}.{{ item.name }}
 
-    Redirect permanent / https://{{ item.name }}/
+    Redirect temp / https://{{ matrix_subdomain }}.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>

roles/monitoring/templates/etc_apache2_sites-available_monit.j2

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName {{ monit_subdomain }}.{{ item.name }}
 
-    Redirect permanent / https://{{ item.name }}/
+    Redirect temp / https://{{ monit_subdomain }}.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>

roles/news/templates/etc_apache2_sites-available_selfoss.j2

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName {{ selfoss_subdomain }}.{{ item.name }}
 
-    Redirect permanent / https://{{ selfoss_subdomain }}.{{ item.name }}/
+    Redirect temp / https://{{ selfoss_subdomain }}.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>

roles/nextcloud/templates/etc_apache2_sites-available_nextcloud.j2

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName {{ nextcloud_subdomain }}.{{ item.name }}
 
-    Redirect permanent / https://{{ nextcloud_subdomain }}.{{ item.name }}/
+    Redirect temp / https://{{ nextcloud_subdomain }}.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>

roles/webmail/templates/etc_apache2_sites-available_roundcube.j2

@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerName {{ webmail_subdomain }}.{{ item.name }}
 
-    Redirect permanent / https://{{ webmail_subdomain }}.{{ item.name }}/
+    Redirect temp / https://{{ webmail_subdomain }}.{{ item.name }}/
 </VirtualHost>
 
 <VirtualHost *:443>