From: Giorgio Ravera Date: Thu, 5 Mar 2026 11:01:16 +0000 (+0100) Subject: Removed local logs and created dedicated files X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=f0c45dc9d24bb84bdfbbf9be5fed374103d56d90;p=apache.git Removed local logs and created dedicated files --- diff --git a/sites-available/000-default.conf b/sites-available/000-default.conf index 0f0b272..3b09568 100644 --- a/sites-available/000-default.conf +++ b/sites-available/000-default.conf @@ -7,11 +7,11 @@ # value is not decisive as it is used as a last resort host regardless. # However, you must set it for any further virtual host explicitly. #ServerName www.example.com + ServerName _default_ ServerAdmin giorgio@giorgioravera.it #DocumentRoot /var/www/html - #DocumentRoot /var/www/www.giorgioravera.it/htdocs RewriteEngine on RewriteCond %{HTTPS} !=on RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] diff --git a/sites-available/ap1.giorgioravera.it.conf b/sites-available/ap1.giorgioravera.it.conf index 00aa1e7..f92c679 100644 --- a/sites-available/ap1.giorgioravera.it.conf +++ b/sites-available/ap1.giorgioravera.it.conf @@ -9,12 +9,9 @@ ServerName ap1.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - ProxyPass / http://ap1.giorgioravera.it/ - ProxyPassReverse / http://ap1.giorgioravera.it/ - - #SSLProxyEngine on - #ProxyPass / https://ap1.giorgioravera.it/ - #ProxyPassReverse / https://ap1.giorgioravera.it/ + SSLProxyEngine on + ProxyPass / https://ap1.giorgioravera.it/ + ProxyPassReverse / https://ap1.giorgioravera.it/ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. diff --git a/sites-available/archivio.giorgioravera.it.conf b/sites-available/archivio.giorgioravera.it.conf index e738d48..f4bb84f 100644 --- a/sites-available/archivio.giorgioravera.it.conf +++ b/sites-available/archivio.giorgioravera.it.conf @@ -11,7 +11,9 @@ DocumentRoot /var/www/archivio.giorgioravera.it/htdocs - AllowOverride All + Options FollowSymlinks + AllowOverride All + Require all granted ScriptAlias /cgi-bin /var/www/archivio.giorgioravera.it/cgi-bin @@ -21,10 +23,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/archivio.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/archivio.giorgioravera.it/log/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_archivio.log + CustomLog ${APACHE_LOG_DIR}/access_archivio.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/asterisk.giorgioravera.it.conf b/sites-available/asterisk.giorgioravera.it.conf index a07b783..6761cd4 100644 --- a/sites-available/asterisk.giorgioravera.it.conf +++ b/sites-available/asterisk.giorgioravera.it.conf @@ -19,8 +19,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_asterisk.log + CustomLog ${APACHE_LOG_DIR}/access_asterisk.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/code.giorgioravera.it.conf b/sites-available/code.giorgioravera.it.conf index ae1aecf..d73d58f 100644 --- a/sites-available/code.giorgioravera.it.conf +++ b/sites-available/code.giorgioravera.it.conf @@ -12,6 +12,8 @@ SSLProxyEngine on ProxyPass / https://code.giorgioravera.it/ ProxyPassReverse / https://code.giorgioravera.it/ + ProxyPass / wss://code.giorgioravera.it/ + ProxyPassReverse / wss://code.giorgioravera.it/ RewriteEngine on RewriteCond %{HTTP:Upgrade} =websocket [NC] diff --git a/sites-available/default-ssl.conf b/sites-available/default-ssl.conf index 3e4c04b..c08218f 100644 --- a/sites-available/default-ssl.conf +++ b/sites-available/default-ssl.conf @@ -1,13 +1,14 @@ + ServerName _default_ + ServerAdmin giorgio@giorgioravera.it - #DocumentRoot /var/www/html - DocumentRoot /var/www/www.giorgioravera.it/htdocs - + DocumentRoot /var/www/html + Options FollowSymlinks AllowOverride All + Require all granted - ScriptAlias /cgi-bin /var/www/www.giorgioravera.it/cgi-bin # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. @@ -16,9 +17,7 @@ #LogLevel info ssl:warn ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/www.giorgioravera.it/log/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/www.giorgioravera.it/log/access.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to @@ -38,7 +37,7 @@ # SSLCertificateFile directive is needed. #SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem #SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key - SSLCertificateFile /etc/ssl/giorgioravera.it/cert.pem + SSLCertificateFile /etc/ssl/giorgioravera.it/fullchain.pem SSLCertificateKeyFile /etc/ssl/giorgioravera.it/privkey.pem # Server Certificate Chain: @@ -49,7 +48,6 @@ # when the CA certificates are directly appended to the server # certificate for convinience. #SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt - SSLCertificateChainFile /etc/ssl/giorgioravera.it/chain.pem # Certificate Authority (CA): # Set the CA certificate verification path where to find CA diff --git a/sites-available/download.giorgioravera.it.conf b/sites-available/download.giorgioravera.it.conf index d260759..bfd2314 100644 --- a/sites-available/download.giorgioravera.it.conf +++ b/sites-available/download.giorgioravera.it.conf @@ -9,6 +9,8 @@ ServerName download.giorgioravera.it ServerAdmin giorgio@giorgioravera.it + ProxyPreserveHost on + SSLProxyEngine on ProxyPass / https://download.giorgioravera.it/ ProxyPassReverse / https://download.giorgioravera.it/ @@ -19,8 +21,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_download.log + CustomLog ${APACHE_LOG_DIR}/access_download.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/fritz.giorgioravera.it.conf b/sites-available/fritz.giorgioravera.it.conf index 9312cc6..7c03722 100644 --- a/sites-available/fritz.giorgioravera.it.conf +++ b/sites-available/fritz.giorgioravera.it.conf @@ -9,12 +9,9 @@ ServerName fritz.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - ProxyPass / http://fritz.giorgioravera.it/ - ProxyPassReverse / http://fritz.giorgioravera.it/ - - #SSLProxyEngine on - #ProxyPass / https://fritz.giorgioravera.it/ - #ProxyPassReverse / https://fritz.giorgioravera.it/ + SSLProxyEngine on + ProxyPass / https://fritz.giorgioravera.it/ + ProxyPassReverse / https://fritz.giorgioravera.it/ # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. diff --git a/sites-available/git.giorgioravera.it.conf b/sites-available/git.giorgioravera.it.conf index 7b464d0..692d2ea 100644 --- a/sites-available/git.giorgioravera.it.conf +++ b/sites-available/git.giorgioravera.it.conf @@ -14,6 +14,7 @@ Options FollowSymlinks ExecCGI AllowOverride All AddHandler cgi-script .cgi + Require all granted DirectoryIndex gitweb.cgi AuthType Basic @@ -44,10 +45,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/git.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/git.giorgioravera.it/log/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_git.log + CustomLog ${APACHE_LOG_DIR}/access_git.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/home.giorgioravera.it.conf b/sites-available/home.giorgioravera.it.conf index d7ee487..043db5b 100644 --- a/sites-available/home.giorgioravera.it.conf +++ b/sites-available/home.giorgioravera.it.conf @@ -9,22 +9,17 @@ ServerName home.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - #ProxyPass /api/websocket ws://home.giorgioravera.it:8123/api/websocket - #ProxyPassReverse /api/websocket ws://home.giorgioravera.it:8123/api/websocket - #ProxyPass / http://home.giorgioravera.it:8123/ - #ProxyPassReverse / http://home.giorgioravera.it:8123/ + ProxyPreserveHost on - SSLProxyEngine on + SSLProxyEngine on ProxyPass / https://home.giorgioravera.it/ ProxyPassReverse / https://home.giorgioravera.it/ + ProxyPass / wss://home.giorgioravera.it/ + ProxyPassReverse / wss://home.giorgioravera.it/ RewriteEngine on - #RewriteCond %{HTTP:Upgrade} =websocket [NC] - #RewriteRule /(.*) ws://home.giorgioravera.it:8123/$1 [P,L] + RewriteCond %{HTTP:Upgrade} =websocket [NC] RewriteRule /(.*) wss://home.giorgioravera.it/$1 [P,L] - #RewriteCond %{HTTP:Upgrade} !=websocket [NC] - #RewriteRule /(.*) http://home.giorgioravera.it:8123/$1 [P,L] - RewriteRule /(.*) https://home.giorgioravera.it/$1 [P,L] # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. diff --git a/sites-available/laura.giorgioravera.it.conf b/sites-available/laura.giorgioravera.it.conf index 6bdcc3f..6223ea6 100644 --- a/sites-available/laura.giorgioravera.it.conf +++ b/sites-available/laura.giorgioravera.it.conf @@ -1,29 +1,35 @@ ServerName laura.giorgioravera.it ServerAdmin giorgio@giorgioravera.it + Redirect permanent / https://laura.giorgioravera.it + - DocumentRoot /var/www/laura.giorgioravera.it/htdocs - - AllowOverride All - - ScriptAlias /cgi-bin /var/www/laura.giorgioravera.it/cgi-bin - SuExecUserGroup "lalaura" "casa" + + + ServerName laura.giorgioravera.it + ServerAdmin giorgio@giorgioravera.it - # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, - # error, crit, alert, emerg. - # It is also possible to configure the loglevel for particular - # modules, e.g. - #LogLevel info ssl:warn + DocumentRoot /var/www/laura.giorgioravera.it/htdocs + + AllowOverride All + + ScriptAlias /cgi-bin /var/www/laura.giorgioravera.it/cgi-bin + SuExecUserGroup "lalaura" "casa" - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/laura.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/laura.giorgioravera.it/log/access.log combined + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn - # For most configuration files from conf-available/, which are - # enabled or disabled at a global level, it is possible to - # include a line for only one particular virtual host. For example the - # following line enables the CGI configuration for this host only - # after it has been globally disabled with "a2disconf". - #Include conf-available/serve-cgi-bin.conf - + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + + diff --git a/sites-available/listanozze.giorgioravera.it.conf b/sites-available/listanozze.giorgioravera.it.conf index 81dd625..7ed9dc1 100644 --- a/sites-available/listanozze.giorgioravera.it.conf +++ b/sites-available/listanozze.giorgioravera.it.conf @@ -1,26 +1,32 @@ ServerName listanozze.giorgioravera.it ServerAdmin giorgio@giorgioravera.it + Redirect permanent / https://listanozze.giorgioravera.it + - DocumentRoot /var/www/wedding.giorgioravera.it/htdocs - ScriptAlias /cgi-bin /var/www/wedding.giorgioravera.it/cgi-bin - SuExecUserGroup "xraver" "casa" + + + ServerName listanozze.giorgioravera.it + ServerAdmin giorgio@giorgioravera.it - # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, - # error, crit, alert, emerg. - # It is also possible to configure the loglevel for particular - # modules, e.g. - #LogLevel info ssl:warn + DocumentRoot /var/www/listanozze.giorgioravera.it/htdocs + ScriptAlias /cgi-bin /var/www/listanozze.giorgioravera.it/cgi-bin + SuExecUserGroup "xraver" "casa" - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/wedding.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/wedding.giorgioravera.it/log/access.log combined + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn - # For most configuration files from conf-available/, which are - # enabled or disabled at a global level, it is possible to - # include a line for only one particular virtual host. For example the - # following line enables the CGI configuration for this host only - # after it has been globally disabled with "a2disconf". - #Include conf-available/serve-cgi-bin.conf - + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + + diff --git a/sites-available/matrimonio.giorgioravera.it.conf b/sites-available/matrimonio.giorgioravera.it.conf index ca715e2..a76ed48 100644 --- a/sites-available/matrimonio.giorgioravera.it.conf +++ b/sites-available/matrimonio.giorgioravera.it.conf @@ -1,26 +1,32 @@ ServerName matrimonio.giorgioravera.it ServerAdmin giorgio@giorgioravera.it + Redirect permanent / https://matrimonio.giorgioravera.it + - DocumentRoot /var/www/matrimonio.giorgioravera.it/htdocs - ScriptAlias /cgi-bin /var/www/matrimonio.giorgioravera.it/cgi-bin - SuExecUserGroup "xraver" "casa" + + + ServerName matrimonio.giorgioravera.it + ServerAdmin giorgio@giorgioravera.it - # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, - # error, crit, alert, emerg. - # It is also possible to configure the loglevel for particular - # modules, e.g. - #LogLevel info ssl:warn + DocumentRoot /var/www/matrimonio.giorgioravera.it/htdocs + ScriptAlias /cgi-bin /var/www/matrimonio.giorgioravera.it/cgi-bin + SuExecUserGroup "xraver" "casa" - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/matrimonio.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/matrimonio.giorgioravera.it/log/access.log combined + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn - # For most configuration files from conf-available/, which are - # enabled or disabled at a global level, it is possible to - # include a line for only one particular virtual host. For example the - # following line enables the CGI configuration for this host only - # after it has been globally disabled with "a2disconf". - #Include conf-available/serve-cgi-bin.conf - + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + + diff --git a/sites-available/nas.giorgioravera.it.conf b/sites-available/nas.giorgioravera.it.conf index a200d8e..7b76b84 100644 --- a/sites-available/nas.giorgioravera.it.conf +++ b/sites-available/nas.giorgioravera.it.conf @@ -19,8 +19,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_nas.log + CustomLog ${APACHE_LOG_DIR}/access_nas.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/pve.giorgioravera.it.conf b/sites-available/pve.giorgioravera.it.conf index c1a9bb1..b281e7d 100644 --- a/sites-available/pve.giorgioravera.it.conf +++ b/sites-available/pve.giorgioravera.it.conf @@ -12,10 +12,12 @@ SSLProxyEngine on ProxyPass / https://pve.giorgioravera.it:8006/ ProxyPassReverse / https://pve.giorgioravera.it:8006/ + ProxyPass / wss://pve.giorgioravera.it:8006/ + ProxyPassReverse / wss://pve.giorgioravera.it:8006/ - RewriteEngine On - RewriteCond %{HTTP:upgrade} websocket [NC] - RewriteRule /(.*) wss://pve.giorgioravera.it:8006/$1 [L,P] + RewriteEngine on + RewriteCond %{HTTP:Upgrade} =websocket [NC] + RewriteRule /(.*) wss://pve.giorgioravera.it:8006/$1 [P,L] # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. diff --git a/sites-available/roundcube.conf b/sites-available/roundcube.conf index 1479b14..7cee3ba 100644 --- a/sites-available/roundcube.conf +++ b/sites-available/roundcube.conf @@ -17,8 +17,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_mail.log + CustomLog ${APACHE_LOG_DIR}/access_mail.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/serverinfo.giorgioravera.it.conf b/sites-available/serverinfo.giorgioravera.it.conf index f6452b6..5127d2d 100644 --- a/sites-available/serverinfo.giorgioravera.it.conf +++ b/sites-available/serverinfo.giorgioravera.it.conf @@ -20,10 +20,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/serverinfo.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/serverinfo.giorgioravera.it/log/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_serverinfo.log + CustomLog ${APACHE_LOG_DIR}/access_serverinfo.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/svn.giorgioravera.it.conf b/sites-available/svn.giorgioravera.it.conf index f2b53fa..8db9d95 100644 --- a/sites-available/svn.giorgioravera.it.conf +++ b/sites-available/svn.giorgioravera.it.conf @@ -11,7 +11,9 @@ DocumentRoot /var/www/svn.giorgioravera.it/htdocs - AllowOverride All + Options FollowSymlinks + AllowOverride All + Require all granted SuExecUserGroup "subversion" "subversion" @@ -21,10 +23,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/svn.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/svn.giorgioravera.it/log/accss.log combined + ErrorLog ${APACHE_LOG_DIR}/error_svn.log + CustomLog ${APACHE_LOG_DIR}/access_svn.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to @@ -33,9 +33,6 @@ # after it has been globally disabled with "a2disconf". #Include conf-available/serve-cgi-bin.conf - # Include websvn configuration - #Include conf-available/websvn.conf - # Include repository configurations Include svn/* diff --git a/sites-available/template_normal.conf b/sites-available/template_normal.conf index 2636afb..d0abbb9 100644 --- a/sites-available/template_normal.conf +++ b/sites-available/template_normal.conf @@ -1,26 +1,36 @@ ServerName SERVERNAME.giorgioravera.it ServerAdmin giorgio@giorgioravera.it + Redirect permanent / https://SERVERNAME.giorgioravera.it + - DocumentRoot /var/www/SERVERNAME.giorgioravera.it/htdocs - ScriptAlias /cgi-bin /var/www/SERVERNAME.giorgioravera.it/cgi-bin - SuExecUserGroup "USERNAME" "USERGROUP" + + + ServerName SERVERNAME.giorgioravera.it + ServerAdmin giorgio@giorgioravera.it - # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, - # error, crit, alert, emerg. - # It is also possible to configure the loglevel for particular - # modules, e.g. - #LogLevel info ssl:warn + DocumentRoot /var/www/SERVERNAME.giorgioravera.it/htdocs + + Options FollowSymlinks + AllowOverride All + Require all granted + + ScriptAlias /cgi-bin /var/www/SERVERNAME.giorgioravera.it/cgi-bin - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/SERVERNAME.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/SERVERNAME.giorgioravera.it/log/access.log combined + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn - # For most configuration files from conf-available/, which are - # enabled or disabled at a global level, it is possible to - # include a line for only one particular virtual host. For example the - # following line enables the CGI configuration for this host only - # after it has been globally disabled with "a2disconf". - #Include conf-available/serve-cgi-bin.conf - + ErrorLog /var/www/SERVERNAME.giorgioravera.it/log/error.log + CustomLog /var/www/SERVERNAME.giorgioravera.it/log/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + + diff --git a/sites-available/template_proxy.conf b/sites-available/template_proxy.conf index beda40e..6f51504 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://SERVERNAME + Redirect permanent / https://SERVERNAME.giorgioravera.it @@ -9,8 +9,15 @@ ServerName SERVERNAME.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - ProxyPass / http://SERVERNAME.giorgioravera.it/ - ProxyPassReverse / http://SERVERNAME.giorgioravera.it/ + SSLProxyEngine on + ProxyPass / https://SERVERNAME.giorgioravera.it/ + ProxyPassReverse / https://SERVERNAME.giorgioravera.it/ + ProxyPass / wss://SERVERNAME.giorgioravera.it/ + ProxyPassReverse / wss://SERVERNAME.giorgioravera.it/ + + RewriteEngine on + RewriteCond %{HTTP:Upgrade} =websocket [NC] + RewriteRule /(.*) wss://SERVERNAME.giorgioravera.it/$1 [P,L] # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. @@ -18,8 +25,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_SERVERNAME.log + CustomLog ${APACHE_LOG_DIR}/access_SERVERNAME.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to diff --git a/sites-available/traefik.giorgioravera.it.conf b/sites-available/traefik.giorgioravera.it.conf index 627cac9..727ad7f 100644 --- a/sites-available/traefik.giorgioravera.it.conf +++ b/sites-available/traefik.giorgioravera.it.conf @@ -9,9 +9,6 @@ ServerName traefik.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - #ProxyPass / http://traefik.giorgioravera.it/ - #ProxyPassReverse / http://traefik.giorgioravera.it/ - SSLProxyEngine on ProxyPass / https://traefik.giorgioravera.it/ ProxyPassReverse / https://traefik.giorgioravera.it/ diff --git a/sites-available/webssh.giorgioravera.it.conf b/sites-available/webssh.giorgioravera.it.conf index d7989f3..1a624cc 100644 --- a/sites-available/webssh.giorgioravera.it.conf +++ b/sites-available/webssh.giorgioravera.it.conf @@ -9,35 +9,15 @@ ServerName webssh.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - - AuthType Basic - AuthName "Area Protetta" - AuthBasicAuthoritative on - AuthBasicProvider ldap - - AuthLDAPURL "ldap://localhost/dc=giorgioravera,dc=it?uid" - AuthLDAPGroupAttribute memberUid - AuthLDAPGroupAttributeIsDN off - #AuthLDAPMaxSubGroupDepth 10 - #AuthLDAPSubGroupAttribute memberUid - #AuthLDAPSubGroupClass groupOfNames groupOfUniqueNames - Require ldap-group cn=ssh,ou=Groups,dc=giorgioravera,dc=it - #Require ldap-user xraver lalaura matteo - - - ProxyPreserveHost On - - ProxyPass / http://webssh.giorgioravera.it:8888/ - ProxyPassReverse / http://webssh.giorgioravera.it:8888/ - - #SSLProxyEngine on - #ProxyPass / https://webssh.giorgioravera.it/ - #ProxyPassReverse / https://webssh.giorgioravera.it/ - - RewriteEngine On - RewriteCond %{HTTP:upgrade} websocket [NC] - RewriteRule /(.*) ws://webssh.giorgioravera.it:8888/$1 [L,P] - #RewriteRule /(.*) wss://webssh.giorgioravera.it/$1 [L,P] + SSLProxyEngine on + ProxyPass / https://webssh.giorgioravera.it/ + ProxyPassReverse / https://webssh.giorgioravera.it/ + ProxyPass / wss://webssh.giorgioravera.it/ + ProxyPassReverse / wss://webssh.giorgioravera.it/ + + RewriteEngine on + RewriteCond %{HTTP:Upgrade} =websocket [NC] + RewriteRule /(.*) wss://webssh.giorgioravera.it/$1 [P,L] # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. diff --git a/sites-available/www.giorgioravera.it.conf b/sites-available/www.giorgioravera.it.conf index 7fc6c76..e1034fe 100644 --- a/sites-available/www.giorgioravera.it.conf +++ b/sites-available/www.giorgioravera.it.conf @@ -13,6 +13,7 @@ Options FollowSymlinks AllowOverride All + Require all granted ScriptAlias /cgi-bin /var/www/www.giorgioravera.it/cgi-bin @@ -22,10 +23,8 @@ # modules, e.g. #LogLevel info ssl:warn - ErrorLog ${APACHE_LOG_DIR}/error.log - ErrorLog /var/www/www.giorgioravera.it/log/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - CustomLog /var/www/www.giorgioravera.it/log/access.log combined + ErrorLog ${APACHE_LOG_DIR}/error_www.log + CustomLog ${APACHE_LOG_DIR}/access_www.log combined # For most configuration files from conf-available/, which are # enabled or disabled at a global level, it is possible to