Changed nas and download to ssl proxy and changed from rewrite to redirect http to...

diff --git a/sites-available/archivio.giorgioravera.it.conf b/sites-available/archivio.giorgioravera.it.conf
index 82064d9776db836df4a1256230b0ce22a6134d3d..ae5897060d627f632a991145b9aa76d28eaa0972 100644 (file)
--- a/sites-available/archivio.giorgioravera.it.conf
+++ b/sites-available/archivio.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/asterisk.giorgioravera.it.conf b/sites-available/asterisk.giorgioravera.it.conf
index 01975c89ecbb342df8035715b2dca5736d7c19c3..aea510909397213795eb1063f4e12a4f8fa0e53f 100644 (file)
--- a/sites-available/asterisk.giorgioravera.it.conf
+++ b/sites-available/asterisk.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/docker.giorgioravera.it.conf b/sites-available/docker.giorgioravera.it.conf
index fbb1fcce91b9b28b36b0d2118a16b1e4dbd5d916..fad9c76f5a2517a98ee8b5e20326f19b87bb31db 100644 (file)
--- a/sites-available/docker.giorgioravera.it.conf
+++ b/sites-available/docker.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/download.giorgioravera.it.conf b/sites-available/download.giorgioravera.it.conf
index 716f1015b065ddf5493c92e49f23f3cfdb143698..c9a869f2f9d15452726faf2e1188b277d16c871b 100644 (file)
--- a/sites-available/download.giorgioravera.it.conf
+++ b/sites-available/download.giorgioravera.it.conf
@@ -1,10 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>
@@ -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
        </VirtualHost>
 </IfModule>
-
-# 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 bb880dbf4a933c89d00c3d8548e59d11b478758c..bef3390e257b38779093424fae1c05407fdf46a6 100644 (file)
--- a/sites-available/git.giorgioravera.it.conf
+++ b/sites-available/git.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/home.giorgioravera.it.conf b/sites-available/home.giorgioravera.it.conf
index 97624b1024593f2d0a1363aa692927bf5a82dcf2..e5703ddcd83aced00ca47da7eeedc83ca7844334 100644 (file)
--- a/sites-available/home.giorgioravera.it.conf
+++ b/sites-available/home.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/nas.giorgioravera.it.conf b/sites-available/nas.giorgioravera.it.conf
index d6daa41cab115d0d7f4eb5aac5b50d7327b608fd..91bab5c745a53a48683ec39426e87ddf0809bf60 100644 (file)
--- a/sites-available/nas.giorgioravera.it.conf
+++ b/sites-available/nas.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>
@@ -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
        </VirtualHost>
 </IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

diff --git a/sites-available/phpldapadmin.conf b/sites-available/phpldapadmin.conf
index 28b38f92e6effad3ba93477d519be0e86d7a5ffd..39b2683dd3acc9e041f2392700bb9b6aeb4b54ed 100644 (file)
--- a/sites-available/phpldapadmin.conf
+++ b/sites-available/phpldapadmin.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/phpmyadmin.conf b/sites-available/phpmyadmin.conf
index 07d8ddc64b742aec70f0d19faf5cb421cd4fed36..96a97fcc9d9e4a7f0615fff3287a37e8312017f5 100644 (file)
--- a/sites-available/phpmyadmin.conf
+++ b/sites-available/phpmyadmin.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/pve.giorgioravera.it.conf b/sites-available/pve.giorgioravera.it.conf
index 0ae13de1eb6e875817a41b873729e1c7003c9484..9004976b290b4f1965fc96e93638e3caf84b0934 100644 (file)
--- a/sites-available/pve.giorgioravera.it.conf
+++ b/sites-available/pve.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/roundcube.conf b/sites-available/roundcube.conf
index f99fba9249fb2241c00e33a8172fb90fd7d89cdf..2261edc323ddbf26ffadbc68905efe3e83f92a28 100644 (file)
--- a/sites-available/roundcube.conf
+++ b/sites-available/roundcube.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/serverinfo.giorgioravera.it.conf b/sites-available/serverinfo.giorgioravera.it.conf
index 8d4e40a0e55f0b073b0b1d1ea4b39d187c09f88b..88a7bbff73a08673b4d75bcfdbf2bce4104e027a 100644 (file)
--- a/sites-available/serverinfo.giorgioravera.it.conf
+++ b/sites-available/serverinfo.giorgioravera.it.conf
@@ -1,12 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>
@@ -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/
        </VirtualHost>

diff --git a/sites-available/svn.giorgioravera.it.conf b/sites-available/svn.giorgioravera.it.conf
index 0578e7200bf647f59e2a0fc7171b0faa6a92d456..d4844346db721df93e03a44a23fb122bf00c45b7 100644 (file)
--- a/sites-available/svn.giorgioravera.it.conf
+++ b/sites-available/svn.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/template_normal_ssl.conf b/sites-available/template_normal_ssl.conf
index 32e4d297e93a8402b9bc3271810148fda8322359..6ba53845ffde9a5065c1678bc2a2014988fb9355 100644 (file)
--- a/sites-available/template_normal_ssl.conf
+++ b/sites-available/template_normal_ssl.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/template_proxy.conf b/sites-available/template_proxy.conf
index 24ce550f605d08b52825383d801729715da7fda8..068e3851131446b7606778f47983b0055a9a537f 100644 (file)
--- a/sites-available/template_proxy.conf
+++ b/sites-available/template_proxy.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/traefik.giorgioravera.it.conf b/sites-available/traefik.giorgioravera.it.conf
index 5d232773c900651dcb51198eb5c41455402b048a..01ec0fac054a8c0f54917cf3f40aab12de8fb66b 100644 (file)
--- a/sites-available/traefik.giorgioravera.it.conf
+++ b/sites-available/traefik.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/webssh.giorgioravera.it.conf b/sites-available/webssh.giorgioravera.it.conf
index e70fa2d48ccd48393ace76f57b9099f1d167ae20..5cf02235671acbdcd8e2267da50270b9d5c9d9da 100644 (file)
--- a/sites-available/webssh.giorgioravera.it.conf
+++ b/sites-available/webssh.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>

diff --git a/sites-available/www.giorgioravera.it.conf b/sites-available/www.giorgioravera.it.conf
index bc4ca88ba3f0ccad328280822a29a1fc1ea4107f..d94a55f0361dcc00a1446110bd16548046404989 100644 (file)
--- a/sites-available/www.giorgioravera.it.conf
+++ b/sites-available/www.giorgioravera.it.conf
@@ -1,9 +1,7 @@
 <VirtualHost *:80>
        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}
 </VirtualHost>
 
 <IfModule mod_ssl.c>