Fixed redirect permament

diff --git a/sites-available/archivio.giorgioravera.it.conf b/sites-available/archivio.giorgioravera.it.conf
index ae5897060d627f632a991145b9aa76d28eaa0972..e738d48b6cc9ad46da3a9d6a6c830966ebb3f57f 100644 (file)
--- a/sites-available/archivio.giorgioravera.it.conf
+++ b/sites-available/archivio.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName archivio.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://archivio.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/asterisk.giorgioravera.it.conf b/sites-available/asterisk.giorgioravera.it.conf
index aea510909397213795eb1063f4e12a4f8fa0e53f..777f317d8604add7a0f9261e7b2e9d91b91deb6e 100644 (file)
--- a/sites-available/asterisk.giorgioravera.it.conf
+++ b/sites-available/asterisk.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName asterisk.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://asterisk.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/cloud.giorgioravera.it.conf b/sites-available/cloud.giorgioravera.it.conf
index 0b9d63b5b001b7feb645b6ef40e4ee7dad80b366..77750624e35fa73afd43b42ee8b9d61c92b41f85 100644 (file)
--- a/sites-available/cloud.giorgioravera.it.conf
+++ b/sites-available/cloud.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        ServerName cloud.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       RewriteEngine on
-       RewriteCond %{HTTPS} !=on
-       RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L]
+       Redirect permanent / https://cloud.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/docker.giorgioravera.it.conf b/sites-available/docker.giorgioravera.it.conf
index fad9c76f5a2517a98ee8b5e20326f19b87bb31db..4754a096d607d3679ed4802eb80d4eb4e8a39084 100644 (file)
--- a/sites-available/docker.giorgioravera.it.conf
+++ b/sites-available/docker.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName docker.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://docker.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/download.giorgioravera.it.conf b/sites-available/download.giorgioravera.it.conf
index c9a869f2f9d15452726faf2e1188b277d16c871b..d260759d64a47ba3f4b494fbde5f80ae1f3e1188 100644 (file)
--- a/sites-available/download.giorgioravera.it.conf
+++ b/sites-available/download.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName download.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://download.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/git.giorgioravera.it.conf b/sites-available/git.giorgioravera.it.conf
index bef3390e257b38779093424fae1c05407fdf46a6..7b464d055c221b8a86a6538b0c2d19999dea75d9 100644 (file)
--- a/sites-available/git.giorgioravera.it.conf
+++ b/sites-available/git.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName git.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://git.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/home.giorgioravera.it.conf b/sites-available/home.giorgioravera.it.conf
index e5703ddcd83aced00ca47da7eeedc83ca7844334..490d9909633db1e78985f8cb96ee3276bbae971e 100644 (file)
--- a/sites-available/home.giorgioravera.it.conf
+++ b/sites-available/home.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName home.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://home.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>
@@ -11,6 +11,8 @@
 
                #ProxyPass /esphome http://home.giorgioravera.it/esphome/
                #ProxyPassReverse /esphome http://home.giorgioravera.it/esphome/
+               #ProxyPass /zigbee2mqtt http://home.giorgioravera.it/zigbee2mqtt/
+               #ProxyPassReverse /zigbee2mqtt http://home.giorgioravera.it/zigbee2mqtt/
 
                ProxyPass /api/websocket ws://home.giorgioravera.it:8123/api/websocket
                ProxyPassReverse /api/websocket ws://home.giorgioravera.it:8123/api/websocket

diff --git a/sites-available/nas.giorgioravera.it.conf b/sites-available/nas.giorgioravera.it.conf
index 91bab5c745a53a48683ec39426e87ddf0809bf60..a200d8eac9a13aecdd44a8ef99125efa37c8debe 100644 (file)
--- a/sites-available/nas.giorgioravera.it.conf
+++ b/sites-available/nas.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName nas.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://nas.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/phpldapadmin.conf b/sites-available/phpldapadmin.conf
index 39b2683dd3acc9e041f2392700bb9b6aeb4b54ed..a279ac52e74622a0fb32f5b5c0c10d3faaf4c71f 100644 (file)
--- a/sites-available/phpldapadmin.conf
+++ b/sites-available/phpldapadmin.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName ldap.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://ldap.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/phpmyadmin.conf b/sites-available/phpmyadmin.conf
index 96a97fcc9d9e4a7f0615fff3287a37e8312017f5..d22ef923def211c8cc9202bead779ed059d9edc4 100644 (file)
--- a/sites-available/phpmyadmin.conf
+++ b/sites-available/phpmyadmin.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName mysql.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://mysql.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/pve.giorgioravera.it.conf b/sites-available/pve.giorgioravera.it.conf
index 9004976b290b4f1965fc96e93638e3caf84b0934..10feeda15448d9414b9e0aa4a75ec286216bce7d 100644 (file)
--- a/sites-available/pve.giorgioravera.it.conf
+++ b/sites-available/pve.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName pve.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://pve.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/roundcube.conf b/sites-available/roundcube.conf
index 2261edc323ddbf26ffadbc68905efe3e83f92a28..1479b1430dd2ac322b673adf71d6bc44d5cd56a5 100644 (file)
--- a/sites-available/roundcube.conf
+++ b/sites-available/roundcube.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName mail.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://mail.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/serverinfo.giorgioravera.it.conf b/sites-available/serverinfo.giorgioravera.it.conf
index 88a7bbff73a08673b4d75bcfdbf2bce4104e027a..5295ce577783f60384762901a63a8572d9e4e63d 100644 (file)
--- a/sites-available/serverinfo.giorgioravera.it.conf
+++ b/sites-available/serverinfo.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName serverinfo.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://serverinfo.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/svn.giorgioravera.it.conf b/sites-available/svn.giorgioravera.it.conf
index d4844346db721df93e03a44a23fb122bf00c45b7..f2b53fa0488007dd03227603fa88122704bffb56 100644 (file)
--- a/sites-available/svn.giorgioravera.it.conf
+++ b/sites-available/svn.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName svn.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://svn.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/template_normal_ssl.conf b/sites-available/template_normal_ssl.conf
index 6ba53845ffde9a5065c1678bc2a2014988fb9355..9e981b9d61485b1bcca97d00b2fa50df4d8aac12 100644 (file)
--- a/sites-available/template_normal_ssl.conf
+++ b/sites-available/template_normal_ssl.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName SERVERNAME.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://SERVERNAME
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/template_proxy.conf b/sites-available/template_proxy.conf
index 068e3851131446b7606778f47983b0055a9a537f..beda40e85836726f56d6c2091bf564d6979b9e08 100644 (file)
--- a/sites-available/template_proxy.conf
+++ b/sites-available/template_proxy.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName SERVERNAME.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://SERVERNAME
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/traefik.giorgioravera.it.conf b/sites-available/traefik.giorgioravera.it.conf
index 01ec0fac054a8c0f54917cf3f40aab12de8fb66b..c9a9629726f36b5e788374f2558f0aef6b18a32d 100644 (file)
--- a/sites-available/traefik.giorgioravera.it.conf
+++ b/sites-available/traefik.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName traefik.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://traefik.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/www.giorgioravera.it.conf b/sites-available/www.giorgioravera.it.conf
index d94a55f0361dcc00a1446110bd16548046404989..7fc6c76be940a0d328bba82ba0ea30b88f6f27bc 100644 (file)
--- a/sites-available/www.giorgioravera.it.conf
+++ b/sites-available/www.giorgioravera.it.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
        ServerName www.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
-       Redirect permanent / https://%{SERVER_NAME}
+       Redirect permanent / https://www.giorgioravera.it
 </VirtualHost>
 
 <IfModule mod_ssl.c>