From f4e2c50c0d50943614ed0cf9f4f5d97c58d09f81 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Mon, 6 Jun 2022 11:58:47 +0200 Subject: [PATCH] Fixed redirect permament --- sites-available/archivio.giorgioravera.it.conf | 2 +- sites-available/asterisk.giorgioravera.it.conf | 2 +- sites-available/cloud.giorgioravera.it.conf | 4 +--- sites-available/docker.giorgioravera.it.conf | 2 +- sites-available/download.giorgioravera.it.conf | 2 +- sites-available/git.giorgioravera.it.conf | 2 +- sites-available/home.giorgioravera.it.conf | 4 +++- sites-available/nas.giorgioravera.it.conf | 2 +- sites-available/phpldapadmin.conf | 2 +- sites-available/phpmyadmin.conf | 2 +- sites-available/pve.giorgioravera.it.conf | 2 +- sites-available/roundcube.conf | 2 +- sites-available/serverinfo.giorgioravera.it.conf | 2 +- sites-available/svn.giorgioravera.it.conf | 2 +- sites-available/template_normal_ssl.conf | 2 +- sites-available/template_proxy.conf | 2 +- sites-available/traefik.giorgioravera.it.conf | 2 +- sites-available/www.giorgioravera.it.conf | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sites-available/archivio.giorgioravera.it.conf b/sites-available/archivio.giorgioravera.it.conf index ae58970..e738d48 100644 --- a/sites-available/archivio.giorgioravera.it.conf +++ b/sites-available/archivio.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName archivio.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://archivio.giorgioravera.it diff --git a/sites-available/asterisk.giorgioravera.it.conf b/sites-available/asterisk.giorgioravera.it.conf index aea5109..777f317 100644 --- a/sites-available/asterisk.giorgioravera.it.conf +++ b/sites-available/asterisk.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName asterisk.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://asterisk.giorgioravera.it diff --git a/sites-available/cloud.giorgioravera.it.conf b/sites-available/cloud.giorgioravera.it.conf index 0b9d63b..7775062 100644 --- a/sites-available/cloud.giorgioravera.it.conf +++ b/sites-available/cloud.giorgioravera.it.conf @@ -1,9 +1,7 @@ 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 diff --git a/sites-available/docker.giorgioravera.it.conf b/sites-available/docker.giorgioravera.it.conf index fad9c76..4754a09 100644 --- a/sites-available/docker.giorgioravera.it.conf +++ b/sites-available/docker.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName docker.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://docker.giorgioravera.it diff --git a/sites-available/download.giorgioravera.it.conf b/sites-available/download.giorgioravera.it.conf index c9a869f..d260759 100644 --- a/sites-available/download.giorgioravera.it.conf +++ b/sites-available/download.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName download.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://download.giorgioravera.it diff --git a/sites-available/git.giorgioravera.it.conf b/sites-available/git.giorgioravera.it.conf index bef3390..7b464d0 100644 --- a/sites-available/git.giorgioravera.it.conf +++ b/sites-available/git.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName git.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://git.giorgioravera.it diff --git a/sites-available/home.giorgioravera.it.conf b/sites-available/home.giorgioravera.it.conf index e5703dd..490d990 100644 --- a/sites-available/home.giorgioravera.it.conf +++ b/sites-available/home.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName home.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://home.giorgioravera.it @@ -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 91bab5c..a200d8e 100644 --- a/sites-available/nas.giorgioravera.it.conf +++ b/sites-available/nas.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName nas.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://nas.giorgioravera.it diff --git a/sites-available/phpldapadmin.conf b/sites-available/phpldapadmin.conf index 39b2683..a279ac5 100644 --- a/sites-available/phpldapadmin.conf +++ b/sites-available/phpldapadmin.conf @@ -1,7 +1,7 @@ ServerName ldap.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://ldap.giorgioravera.it diff --git a/sites-available/phpmyadmin.conf b/sites-available/phpmyadmin.conf index 96a97fc..d22ef92 100644 --- a/sites-available/phpmyadmin.conf +++ b/sites-available/phpmyadmin.conf @@ -1,7 +1,7 @@ ServerName mysql.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://mysql.giorgioravera.it diff --git a/sites-available/pve.giorgioravera.it.conf b/sites-available/pve.giorgioravera.it.conf index 9004976..10feeda 100644 --- a/sites-available/pve.giorgioravera.it.conf +++ b/sites-available/pve.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName pve.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://pve.giorgioravera.it diff --git a/sites-available/roundcube.conf b/sites-available/roundcube.conf index 2261edc..1479b14 100644 --- a/sites-available/roundcube.conf +++ b/sites-available/roundcube.conf @@ -1,7 +1,7 @@ ServerName mail.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://mail.giorgioravera.it diff --git a/sites-available/serverinfo.giorgioravera.it.conf b/sites-available/serverinfo.giorgioravera.it.conf index 88a7bbf..5295ce5 100644 --- a/sites-available/serverinfo.giorgioravera.it.conf +++ b/sites-available/serverinfo.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName serverinfo.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://serverinfo.giorgioravera.it diff --git a/sites-available/svn.giorgioravera.it.conf b/sites-available/svn.giorgioravera.it.conf index d484434..f2b53fa 100644 --- a/sites-available/svn.giorgioravera.it.conf +++ b/sites-available/svn.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName svn.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://svn.giorgioravera.it diff --git a/sites-available/template_normal_ssl.conf b/sites-available/template_normal_ssl.conf index 6ba5384..9e981b9 100644 --- a/sites-available/template_normal_ssl.conf +++ b/sites-available/template_normal_ssl.conf @@ -1,7 +1,7 @@ ServerName SERVERNAME.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://SERVERNAME diff --git a/sites-available/template_proxy.conf b/sites-available/template_proxy.conf index 068e385..beda40e 100644 --- a/sites-available/template_proxy.conf +++ b/sites-available/template_proxy.conf @@ -1,7 +1,7 @@ ServerName SERVERNAME.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://SERVERNAME diff --git a/sites-available/traefik.giorgioravera.it.conf b/sites-available/traefik.giorgioravera.it.conf index 01ec0fa..c9a9629 100644 --- a/sites-available/traefik.giorgioravera.it.conf +++ b/sites-available/traefik.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName traefik.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://traefik.giorgioravera.it diff --git a/sites-available/www.giorgioravera.it.conf b/sites-available/www.giorgioravera.it.conf index d94a55f..7fc6c76 100644 --- a/sites-available/www.giorgioravera.it.conf +++ b/sites-available/www.giorgioravera.it.conf @@ -1,7 +1,7 @@ ServerName www.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - Redirect permanent / https://%{SERVER_NAME} + Redirect permanent / https://www.giorgioravera.it -- 2.47.3