thomas
/
sovereign
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

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

Thomas Buck 5 years ago
parent
cce03e9f94
commit
7b8f15528d
9 changed files with 10 additions and 11 deletions
Unified View Show Diff Stats
  1. 1
    1
      roles/blog/templates/etc_apache2_sites-available_blog.j2
  2. 1
    1
      roles/blog/templates/etc_apache2_sites-available_fathom.j2
  3. 1
    1
      roles/gitea/templates/etc_apache2_sites-available_gitea.j2
  4. 2
    3
      roles/mailserver/templates/etc_apache2_sites-available_autoconfig.j2
  5. 1
    1
      roles/matrix/templates/etc_apache2_sites-available_matrix.j2
  6. 1
    1
      roles/monitoring/templates/etc_apache2_sites-available_monit.j2
  7. 1
    1
      roles/news/templates/etc_apache2_sites-available_selfoss.j2
  8. 1
    1
      roles/nextcloud/templates/etc_apache2_sites-available_nextcloud.j2
  9. 1
    1
      roles/webmail/templates/etc_apache2_sites-available_roundcube.j2

+ 1
- 1
roles/blog/templates/etc_apache2_sites-available_blog.j2 View File

2 
     ServerName {{ item.name }}
 2 
     ServerName {{ item.name }}
3 
     ServerAlias www.{{ item.name }}
 3 
     ServerAlias www.{{ item.name }}
4
4
5 
-    Redirect permanent / https://{{ item.name }}/
5 
+    Redirect temp / https://www.{{ item.name }}/
6 
 </VirtualHost>
 6 
 </VirtualHost>
7
7
8 
 <VirtualHost *:443>
 8 
 <VirtualHost *:443>

+ 1
- 1
roles/blog/templates/etc_apache2_sites-available_fathom.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName fathom.{{ item.name }}
 2 
     ServerName fathom.{{ item.name }}
3
3
4 
-    Redirect permanent / https://{{ item.name }}/
4 
+    Redirect temp / https://fathom.{{ item.name }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>

+ 1
- 1
roles/gitea/templates/etc_apache2_sites-available_gitea.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName {{ gitea_subdomain }}.{{ item.name }}
 2 
     ServerName {{ gitea_subdomain }}.{{ item.name }}
3
3
4 
-    Redirect permanent / https://{{ item.name }}/
4 
+    Redirect temp / https://{{ gitea_subdomain }}.{{ item.name }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>

+ 2
- 3
roles/mailserver/templates/etc_apache2_sites-available_autoconfig.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName {{ mail_server_autoconfig_hostname }}
 2 
     ServerName {{ mail_server_autoconfig_hostname }}
3
3
4 
-    Redirect permanent / https://{{ mail_server_autoconfig_hostname }}/
4 
+    Redirect temp / https://{{ mail_server_autoconfig_hostname }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>
8 
     ServerName {{ mail_server_autoconfig_hostname }}
 8 
     ServerName {{ mail_server_autoconfig_hostname }}
9 
-    SSLEngine On
10
9
10 
+    SSLEngine               On
11 
     DocumentRoot            "/var/www/autoconfig"
 11 
     DocumentRoot            "/var/www/autoconfig"
12 
     Options                 -Indexes
 12 
     Options                 -Indexes
13 
-
14 
     HostnameLookups         Off
 13 
     HostnameLookups         Off
15 
 </VirtualHost>
 14 
 </VirtualHost>

+ 1
- 1
roles/matrix/templates/etc_apache2_sites-available_matrix.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName {{ matrix_subdomain }}.{{ item.name }}
 2 
     ServerName {{ matrix_subdomain }}.{{ item.name }}
3
3
4 
-    Redirect permanent / https://{{ item.name }}/
4 
+    Redirect temp / https://{{ matrix_subdomain }}.{{ item.name }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>

+ 1
- 1
roles/monitoring/templates/etc_apache2_sites-available_monit.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName {{ monit_subdomain }}.{{ item.name }}
 2 
     ServerName {{ monit_subdomain }}.{{ item.name }}
3
3
4 
-    Redirect permanent / https://{{ item.name }}/
4 
+    Redirect temp / https://{{ monit_subdomain }}.{{ item.name }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>

+ 1
- 1
roles/news/templates/etc_apache2_sites-available_selfoss.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName {{ selfoss_subdomain }}.{{ item.name }}
 2 
     ServerName {{ selfoss_subdomain }}.{{ item.name }}
3
3
4 
-    Redirect permanent / https://{{ selfoss_subdomain }}.{{ item.name }}/
4 
+    Redirect temp / https://{{ selfoss_subdomain }}.{{ item.name }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>

+ 1
- 1
roles/nextcloud/templates/etc_apache2_sites-available_nextcloud.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName {{ nextcloud_subdomain }}.{{ item.name }}
 2 
     ServerName {{ nextcloud_subdomain }}.{{ item.name }}
3
3
4 
-    Redirect permanent / https://{{ nextcloud_subdomain }}.{{ item.name }}/
4 
+    Redirect temp / https://{{ nextcloud_subdomain }}.{{ item.name }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>

+ 1
- 1
roles/webmail/templates/etc_apache2_sites-available_roundcube.j2 View File

1 
 <VirtualHost *:80>
 1 
 <VirtualHost *:80>
2 
     ServerName {{ webmail_subdomain }}.{{ item.name }}
 2 
     ServerName {{ webmail_subdomain }}.{{ item.name }}
3
3
4 
-    Redirect permanent / https://{{ webmail_subdomain }}.{{ item.name }}/
4 
+    Redirect temp / https://{{ webmail_subdomain }}.{{ item.name }}/
5 
 </VirtualHost>
 5 
 </VirtualHost>
6
6
7 
 <VirtualHost *:443>
 7 
 <VirtualHost *:443>

Write Preview
Loading…
Cancel
Save