From ecfb84e14a99de93614d92e32f67fb0c3e068bf0 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Fri, 3 Jul 2020 17:50:34 +0200 Subject: [PATCH] Fixed wordpress & home assistant (no esphome) --- sites-available/000-default.conf | 7 +- ...{default-ssl.conf => 001-default-ssl.conf} | 12 +++- .../serverinfo.giorgioravera.it.conf | 1 - sites-available/www.giorgioravera.it.conf | 67 +++++++++---------- 4 files changed, 44 insertions(+), 43 deletions(-) rename sites-available/{default-ssl.conf => 001-default-ssl.conf} (93%) diff --git a/sites-available/000-default.conf b/sites-available/000-default.conf index 4322e71..0f0b272 100644 --- a/sites-available/000-default.conf +++ b/sites-available/000-default.conf @@ -11,9 +11,10 @@ ServerAdmin giorgio@giorgioravera.it #DocumentRoot /var/www/html - DocumentRoot /var/www/www.giorgioravera.it/htdocs + #DocumentRoot /var/www/www.giorgioravera.it/htdocs RewriteEngine on - RewriteRule /.* http://www.giorgioravera.it/ [R] + RewriteCond %{HTTPS} !=on + RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. @@ -31,5 +32,3 @@ # after it has been globally disabled with "a2disconf". #Include conf-available/serve-cgi-bin.conf - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/sites-available/default-ssl.conf b/sites-available/001-default-ssl.conf similarity index 93% rename from sites-available/default-ssl.conf rename to sites-available/001-default-ssl.conf index 84c8a95..fd93d32 100644 --- a/sites-available/default-ssl.conf +++ b/sites-available/001-default-ssl.conf @@ -4,6 +4,11 @@ #DocumentRoot /var/www/html DocumentRoot /var/www/www.giorgioravera.it/htdocs + + Options FollowSymlinks + AllowOverride All + + ScriptAlias /cgi-bin /var/www/www.giorgioravera.it/cgi-bin # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. @@ -12,7 +17,9 @@ #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 @@ -30,8 +37,8 @@ # /usr/share/doc/apache2/README.Debian.gz for more info. # If both key and certificate are stored in the same file, only the # SSLCertificateFile directive is needed. - # SSLCertificateFile /etc/ssl/giorgioravera.it/certs/server.giorgioravera.it.crt - # SSLCertificateKeyFile /etc/ssl/giorgioravera.it/certs/server.giorgioravera.it.key + #SSLCertificateFile /etc/ssl/giorgioravera.it/cert.pem + #SSLCertificateKeyFile /etc/ssl/giorgioravera.it/privkey.pem SSLCertificateFile /etc/letsencrypt/live/server.giorgioravera.it/cert.pem SSLCertificateKeyFile /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem @@ -44,6 +51,7 @@ # 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 SSLCertificateChainFile /etc/letsencrypt/live/server.giorgioravera.it/chain.pem # Certificate Authority (CA): diff --git a/sites-available/serverinfo.giorgioravera.it.conf b/sites-available/serverinfo.giorgioravera.it.conf index 5a9cd83..8d4e40a 100644 --- a/sites-available/serverinfo.giorgioravera.it.conf +++ b/sites-available/serverinfo.giorgioravera.it.conf @@ -1,7 +1,6 @@ ServerName serverinfo.giorgioravera.it ServerAdmin giorgio@giorgioravera.it - #RedirectMatch ^(.*) https://serverinfo.giorgioravera.it RewriteEngine on RewriteCond %{HTTPS} !=on RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] diff --git a/sites-available/www.giorgioravera.it.conf b/sites-available/www.giorgioravera.it.conf index f3c28d2..bc4ca88 100644 --- a/sites-available/www.giorgioravera.it.conf +++ b/sites-available/www.giorgioravera.it.conf @@ -1,44 +1,39 @@ ServerName www.giorgioravera.it ServerAdmin giorgio@giorgioravera.it + RewriteEngine on + RewriteCond %{HTTPS} !=on + RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L] + - DocumentRoot /var/www/www.giorgioravera.it/htdocs - - AllowOverride All - - ScriptAlias /cgi-bin /var/www/www.giorgioravera.it/cgi-bin - - # 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 + + + ServerName www.giorgioravera.it + ServerAdmin giorgio@giorgioravera.it - 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 + DocumentRoot /var/www/www.giorgioravera.it/htdocs + + Options FollowSymlinks + AllowOverride All + + ScriptAlias /cgi-bin /var/www/www.giorgioravera.it/cgi-bin - # 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 + # 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 - - # imposto un limite di banda di 30gb - #CBandLimit 30G - # max kbps | max requests | max open connections - CBandSpeed 2048 25 50 - CBandRemoteSpeed 20kb/s 5 5 - # percorso dello scoreboard - CBandScoreboard /etc/apache2/scboards/www.giorgioravera.it.scb - # scoreboard lifetime - CBandPeriod 4W - # Indirizzo al quale eseguire il redirect in caso di banda esaurita - #CBandDefaultExceededURL http://mydomain.tld/bwexceed.php - - + 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 -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet + # 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 + + -- 2.47.3