From 8370da4ad28177bf42fb7e8b3bf9fe548be352e9 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Sun, 17 Apr 2022 20:08:37 +0200 Subject: [PATCH] Changed nas and download to ssl proxy and changed from rewrite to redirect http to https --- sites-available/archivio.giorgioravera.it.conf | 4 +--- sites-available/asterisk.giorgioravera.it.conf | 4 +--- sites-available/docker.giorgioravera.it.conf | 4 +--- sites-available/download.giorgioravera.it.conf | 12 ++++-------- sites-available/git.giorgioravera.it.conf | 4 +--- sites-available/home.giorgioravera.it.conf | 4 +--- sites-available/nas.giorgioravera.it.conf | 11 ++++------- sites-available/phpldapadmin.conf | 4 +--- sites-available/phpmyadmin.conf | 4 +--- sites-available/pve.giorgioravera.it.conf | 4 +--- sites-available/roundcube.conf | 4 +--- sites-available/serverinfo.giorgioravera.it.conf | 13 +------------ sites-available/svn.giorgioravera.it.conf | 4 +--- sites-available/template_normal_ssl.conf | 4 +--- sites-available/template_proxy.conf | 4 +--- sites-available/traefik.giorgioravera.it.conf | 4 +--- sites-available/webssh.giorgioravera.it.conf | 4 +--- sites-available/www.giorgioravera.it.conf | 4 +--- 18 files changed, 24 insertions(+), 72 deletions(-) diff --git a/sites-available/archivio.giorgioravera.it.conf b/sites-available/archivio.giorgioravera.it.conf index 82064d9..ae58970 100644 --- a/sites-available/archivio.giorgioravera.it.conf +++ b/sites-available/archivio.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName archivio.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/asterisk.giorgioravera.it.conf b/sites-available/asterisk.giorgioravera.it.conf index 01975c8..aea5109 100644 --- a/sites-available/asterisk.giorgioravera.it.conf +++ b/sites-available/asterisk.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName asterisk.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/docker.giorgioravera.it.conf b/sites-available/docker.giorgioravera.it.conf index fbb1fcc..fad9c76 100644 --- a/sites-available/docker.giorgioravera.it.conf +++ b/sites-available/docker.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName docker.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/download.giorgioravera.it.conf b/sites-available/download.giorgioravera.it.conf index 716f101..c9a869f 100644 --- a/sites-available/download.giorgioravera.it.conf +++ b/sites-available/download.giorgioravera.it.conf @@ -1,10 +1,7 @@ ServerName download.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - #RedirectMatch ^/$ https://download.giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} @@ -12,8 +9,9 @@ ServerName download.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - ProxyPass / http://download.giorgioravera.it/ - ProxyPassReverse / http://download.giorgioravera.it/ + SSLProxyEngine on + ProxyPass / https://download.giorgioravera.it/ + ProxyPassReverse / https://download.giorgioravera.it/ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. @@ -32,5 +30,3 @@ #Include conf-available/serve-cgi-bin.conf - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/sites-available/git.giorgioravera.it.conf b/sites-available/git.giorgioravera.it.conf index bb880db..bef3390 100644 --- a/sites-available/git.giorgioravera.it.conf +++ b/sites-available/git.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName git.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/home.giorgioravera.it.conf b/sites-available/home.giorgioravera.it.conf index 97624b1..e5703dd 100644 --- a/sites-available/home.giorgioravera.it.conf +++ b/sites-available/home.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName home.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/nas.giorgioravera.it.conf b/sites-available/nas.giorgioravera.it.conf index d6daa41..91bab5c 100644 --- a/sites-available/nas.giorgioravera.it.conf +++ b/sites-available/nas.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName nas.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} @@ -11,8 +9,9 @@ ServerName nas.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - ProxyPass / http://nas.giorgioravera.it:8080/ - ProxyPassReverse / http://nas.giorgioravera.it:8080/ + SSLProxyEngine on + ProxyPass / https://nas.giorgioravera.it/ + ProxyPassReverse / https://nas.giorgioravera.it/ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. @@ -31,5 +30,3 @@ #Include conf-available/serve-cgi-bin.conf - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/sites-available/phpldapadmin.conf b/sites-available/phpldapadmin.conf index 28b38f9..39b2683 100644 --- a/sites-available/phpldapadmin.conf +++ b/sites-available/phpldapadmin.conf @@ -1,9 +1,7 @@ ServerName ldap.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/phpmyadmin.conf b/sites-available/phpmyadmin.conf index 07d8ddc..96a97fc 100644 --- a/sites-available/phpmyadmin.conf +++ b/sites-available/phpmyadmin.conf @@ -1,9 +1,7 @@ ServerName mysql.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/pve.giorgioravera.it.conf b/sites-available/pve.giorgioravera.it.conf index 0ae13de..9004976 100644 --- a/sites-available/pve.giorgioravera.it.conf +++ b/sites-available/pve.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName pve.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/roundcube.conf b/sites-available/roundcube.conf index f99fba9..2261edc 100644 --- a/sites-available/roundcube.conf +++ b/sites-available/roundcube.conf @@ -1,9 +1,7 @@ ServerName mail.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/serverinfo.giorgioravera.it.conf b/sites-available/serverinfo.giorgioravera.it.conf index 8d4e40a..88a7bbf 100644 --- a/sites-available/serverinfo.giorgioravera.it.conf +++ b/sites-available/serverinfo.giorgioravera.it.conf @@ -1,12 +1,7 @@ ServerName serverinfo.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] - - # Zabbix Configuration - #Include conf-available/zabbix-frontend-php.conf + Redirect permanent / https://%{SERVER_NAME} @@ -40,12 +35,6 @@ # Zabbix Configuration #Include conf-available/zabbix-frontend-php.conf - #ProxyPass /terminal/ http://localhost:8022/ - #ProxyPassReverse /terminal/ http://localhost:8022/ - - #ProxyPass /xen/ http://localhost:8080/ - #ProxyPassReverse /xen/ http://localhost:8080/ - #ProxyPass /webmin/ http://serverinfo.giorgioravera.it:10000/ #ProxyPassReverse /webmin/ http://serverinfo.giorgioravera.it:10000/ diff --git a/sites-available/svn.giorgioravera.it.conf b/sites-available/svn.giorgioravera.it.conf index 0578e72..d484434 100644 --- a/sites-available/svn.giorgioravera.it.conf +++ b/sites-available/svn.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName svn.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/template_normal_ssl.conf b/sites-available/template_normal_ssl.conf index 32e4d29..6ba5384 100644 --- a/sites-available/template_normal_ssl.conf +++ b/sites-available/template_normal_ssl.conf @@ -1,9 +1,7 @@ ServerName SERVERNAME.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/template_proxy.conf b/sites-available/template_proxy.conf index 24ce550..068e385 100644 --- a/sites-available/template_proxy.conf +++ b/sites-available/template_proxy.conf @@ -1,9 +1,7 @@ ServerName SERVERNAME.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/traefik.giorgioravera.it.conf b/sites-available/traefik.giorgioravera.it.conf index 5d23277..01ec0fa 100644 --- a/sites-available/traefik.giorgioravera.it.conf +++ b/sites-available/traefik.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName traefik.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/webssh.giorgioravera.it.conf b/sites-available/webssh.giorgioravera.it.conf index e70fa2d..5cf0223 100644 --- a/sites-available/webssh.giorgioravera.it.conf +++ b/sites-available/webssh.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName webssh.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} diff --git a/sites-available/www.giorgioravera.it.conf b/sites-available/www.giorgioravera.it.conf index bc4ca88..d94a55f 100644 --- a/sites-available/www.giorgioravera.it.conf +++ b/sites-available/www.giorgioravera.it.conf @@ -1,9 +1,7 @@ ServerName www.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - RewriteEngine on - RewriteCond %{HTTPS} !=on - RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + Redirect permanent / https://%{SERVER_NAME} -- 2.47.3