]> git.giorgioravera.it Git - apache.git/commitdiff
Fixed wordpress & home assistant (no esphome)
authorGiorgio Ravera <giorgio.ravera@gmail.com>
Fri, 3 Jul 2020 15:50:34 +0000 (17:50 +0200)
committerGiorgio Ravera <giorgio.ravera@gmail.com>
Fri, 3 Jul 2020 15:50:34 +0000 (17:50 +0200)
sites-available/000-default.conf
sites-available/001-default-ssl.conf [new file with mode: 0644]
sites-available/default-ssl.conf [deleted file]
sites-available/serverinfo.giorgioravera.it.conf
sites-available/www.giorgioravera.it.conf

index 4322e71f89600adef07fb6a6bad64d84d60432c9..0f0b272e42f452b836e8130f9fbc218ce8632088 100644 (file)
        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
 </VirtualHost>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/sites-available/001-default-ssl.conf b/sites-available/001-default-ssl.conf
new file mode 100644 (file)
index 0000000..fd93d32
--- /dev/null
@@ -0,0 +1,147 @@
+<IfModule mod_ssl.c>
+       <VirtualHost _default_:443>
+               ServerAdmin giorgio@giorgioravera.it
+
+               #DocumentRoot /var/www/html
+               DocumentRoot /var/www/www.giorgioravera.it/htdocs
+               <Directory /var/www/www.giorgioravera.it/htdocs>
+                       Options FollowSymlinks
+                       AllowOverride All
+               </Directory>
+               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
+
+               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
+               # 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
+
+               #   SSL Engine Switch:
+               #   Enable/Disable SSL for this virtual host.
+               SSLEngine on
+
+               #   A self-signed (snakeoil) certificate can be created by installing
+               #   the ssl-cert package. See
+               #   /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/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
+
+
+               #   Server Certificate Chain:
+               #   Point SSLCertificateChainFile at a file containing the
+               #   concatenation of PEM encoded CA certificates which form the
+               #   certificate chain for the server certificate. Alternatively
+               #   the referenced file can be the same as SSLCertificateFile
+               #   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):
+               #   Set the CA certificate verification path where to find CA
+               #   certificates for client authentication or alternatively one
+               #   huge file containing all of them (file must be PEM encoded)
+               #   Note: Inside SSLCACertificatePath you need hash symlinks
+               #                to point to the certificate files. Use the provided
+               #                Makefile to update the hash symlinks after changes.
+               #SSLCACertificatePath /etc/ssl/certs/
+               #SSLCACertificateFile /etc/ssl/giorgioravera.it/ca.crt
+
+               #   Certificate Revocation Lists (CRL):
+               #   Set the CA revocation path where to find CA CRLs for client
+               #   authentication or alternatively one huge file containing all
+               #   of them (file must be PEM encoded)
+               #   Note: Inside SSLCARevocationPath you need hash symlinks
+               #                to point to the certificate files. Use the provided
+               #                Makefile to update the hash symlinks after changes.
+               #SSLCARevocationPath /etc/apache2/ssl.crl/
+               #SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl
+
+               #   Client Authentication (Type):
+               #   Client certificate verification type and depth.  Types are
+               #   none, optional, require and optional_no_ca.  Depth is a
+               #   number which specifies how deeply to verify the certificate
+               #   issuer chain before deciding the certificate is not valid.
+               #SSLVerifyClient require
+               #SSLVerifyDepth  10
+
+               #   SSL Engine Options:
+               #   Set various options for the SSL engine.
+               #   o FakeBasicAuth:
+               #        Translate the client X.509 into a Basic Authorisation.  This means that
+               #        the standard Auth/DBMAuth methods can be used for access control.  The
+               #        user name is the `one line' version of the client's X.509 certificate.
+               #        Note that no password is obtained from the user. Every entry in the user
+               #        file needs this password: `xxj31ZMTZzkVA'.
+               #   o ExportCertData:
+               #        This exports two additional environment variables: SSL_CLIENT_CERT and
+               #        SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
+               #        server (always existing) and the client (only existing when client
+               #        authentication is used). This can be used to import the certificates
+               #        into CGI scripts.
+               #   o StdEnvVars:
+               #        This exports the standard SSL/TLS related `SSL_*' environment variables.
+               #        Per default this exportation is switched off for performance reasons,
+               #        because the extraction step is an expensive operation and is usually
+               #        useless for serving static content. So one usually enables the
+               #        exportation for CGI and SSI requests only.
+               #   o OptRenegotiate:
+               #        This enables optimized SSL connection renegotiation handling when SSL
+               #        directives are used in per-directory context.
+               #SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
+               <FilesMatch "\.(cgi|shtml|phtml|php)$">
+                               SSLOptions +StdEnvVars
+               </FilesMatch>
+               <Directory /usr/lib/cgi-bin>
+                               SSLOptions +StdEnvVars
+               </Directory>
+
+               #   SSL Protocol Adjustments:
+               #   The safe and default but still SSL/TLS standard compliant shutdown
+               #   approach is that mod_ssl sends the close notify alert but doesn't wait for
+               #   the close notify alert from client. When you need a different shutdown
+               #   approach you can use one of the following variables:
+               #   o ssl-unclean-shutdown:
+               #        This forces an unclean shutdown when the connection is closed, i.e. no
+               #        SSL close notify alert is send or allowed to received.  This violates
+               #        the SSL/TLS standard but is needed for some brain-dead browsers. Use
+               #        this when you receive I/O errors because of the standard approach where
+               #        mod_ssl sends the close notify alert.
+               #   o ssl-accurate-shutdown:
+               #        This forces an accurate shutdown when the connection is closed, i.e. a
+               #        SSL close notify alert is send and mod_ssl waits for the close notify
+               #        alert of the client. This is 100% SSL/TLS standard compliant, but in
+               #        practice often causes hanging connections with brain-dead browsers. Use
+               #        this only for browsers where you know that their SSL implementation
+               #        works correctly.
+               #   Notice: Most problems of broken clients are also related to the HTTP
+               #   keep-alive facility, so you usually additionally want to disable
+               #   keep-alive for those clients, too. Use variable "nokeepalive" for this.
+               #   Similarly, one has to force some clients to use HTTP/1.0 to workaround
+               #   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
+               #   "force-response-1.0" for this.
+               # BrowserMatch "MSIE [2-6]" \
+               #               nokeepalive ssl-unclean-shutdown \
+               #               downgrade-1.0 force-response-1.0
+
+       </VirtualHost>
+</IfModule>
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
diff --git a/sites-available/default-ssl.conf b/sites-available/default-ssl.conf
deleted file mode 100644 (file)
index 84c8a95..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-<IfModule mod_ssl.c>
-       <VirtualHost _default_:443>
-               ServerAdmin giorgio@giorgioravera.it
-
-               #DocumentRoot /var/www/html
-               DocumentRoot /var/www/www.giorgioravera.it/htdocs
-
-               # 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
-
-               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
-
-               #   SSL Engine Switch:
-               #   Enable/Disable SSL for this virtual host.
-               SSLEngine on
-
-               #   A self-signed (snakeoil) certificate can be created by installing
-               #   the ssl-cert package. See
-               #   /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/letsencrypt/live/server.giorgioravera.it/cert.pem
-               SSLCertificateKeyFile /etc/letsencrypt/live/server.giorgioravera.it/privkey.pem
-
-
-               #   Server Certificate Chain:
-               #   Point SSLCertificateChainFile at a file containing the
-               #   concatenation of PEM encoded CA certificates which form the
-               #   certificate chain for the server certificate. Alternatively
-               #   the referenced file can be the same as SSLCertificateFile
-               #   when the CA certificates are directly appended to the server
-               #   certificate for convinience.
-               #SSLCertificateChainFile /etc/apache2/ssl.crt/server-ca.crt
-               SSLCertificateChainFile /etc/letsencrypt/live/server.giorgioravera.it/chain.pem
-
-               #   Certificate Authority (CA):
-               #   Set the CA certificate verification path where to find CA
-               #   certificates for client authentication or alternatively one
-               #   huge file containing all of them (file must be PEM encoded)
-               #   Note: Inside SSLCACertificatePath you need hash symlinks
-               #                to point to the certificate files. Use the provided
-               #                Makefile to update the hash symlinks after changes.
-               #SSLCACertificatePath /etc/ssl/certs/
-               #SSLCACertificateFile /etc/ssl/giorgioravera.it/ca.crt
-
-               #   Certificate Revocation Lists (CRL):
-               #   Set the CA revocation path where to find CA CRLs for client
-               #   authentication or alternatively one huge file containing all
-               #   of them (file must be PEM encoded)
-               #   Note: Inside SSLCARevocationPath you need hash symlinks
-               #                to point to the certificate files. Use the provided
-               #                Makefile to update the hash symlinks after changes.
-               #SSLCARevocationPath /etc/apache2/ssl.crl/
-               #SSLCARevocationFile /etc/apache2/ssl.crl/ca-bundle.crl
-
-               #   Client Authentication (Type):
-               #   Client certificate verification type and depth.  Types are
-               #   none, optional, require and optional_no_ca.  Depth is a
-               #   number which specifies how deeply to verify the certificate
-               #   issuer chain before deciding the certificate is not valid.
-               #SSLVerifyClient require
-               #SSLVerifyDepth  10
-
-               #   SSL Engine Options:
-               #   Set various options for the SSL engine.
-               #   o FakeBasicAuth:
-               #        Translate the client X.509 into a Basic Authorisation.  This means that
-               #        the standard Auth/DBMAuth methods can be used for access control.  The
-               #        user name is the `one line' version of the client's X.509 certificate.
-               #        Note that no password is obtained from the user. Every entry in the user
-               #        file needs this password: `xxj31ZMTZzkVA'.
-               #   o ExportCertData:
-               #        This exports two additional environment variables: SSL_CLIENT_CERT and
-               #        SSL_SERVER_CERT. These contain the PEM-encoded certificates of the
-               #        server (always existing) and the client (only existing when client
-               #        authentication is used). This can be used to import the certificates
-               #        into CGI scripts.
-               #   o StdEnvVars:
-               #        This exports the standard SSL/TLS related `SSL_*' environment variables.
-               #        Per default this exportation is switched off for performance reasons,
-               #        because the extraction step is an expensive operation and is usually
-               #        useless for serving static content. So one usually enables the
-               #        exportation for CGI and SSI requests only.
-               #   o OptRenegotiate:
-               #        This enables optimized SSL connection renegotiation handling when SSL
-               #        directives are used in per-directory context.
-               #SSLOptions +FakeBasicAuth +ExportCertData +StrictRequire
-               <FilesMatch "\.(cgi|shtml|phtml|php)$">
-                               SSLOptions +StdEnvVars
-               </FilesMatch>
-               <Directory /usr/lib/cgi-bin>
-                               SSLOptions +StdEnvVars
-               </Directory>
-
-               #   SSL Protocol Adjustments:
-               #   The safe and default but still SSL/TLS standard compliant shutdown
-               #   approach is that mod_ssl sends the close notify alert but doesn't wait for
-               #   the close notify alert from client. When you need a different shutdown
-               #   approach you can use one of the following variables:
-               #   o ssl-unclean-shutdown:
-               #        This forces an unclean shutdown when the connection is closed, i.e. no
-               #        SSL close notify alert is send or allowed to received.  This violates
-               #        the SSL/TLS standard but is needed for some brain-dead browsers. Use
-               #        this when you receive I/O errors because of the standard approach where
-               #        mod_ssl sends the close notify alert.
-               #   o ssl-accurate-shutdown:
-               #        This forces an accurate shutdown when the connection is closed, i.e. a
-               #        SSL close notify alert is send and mod_ssl waits for the close notify
-               #        alert of the client. This is 100% SSL/TLS standard compliant, but in
-               #        practice often causes hanging connections with brain-dead browsers. Use
-               #        this only for browsers where you know that their SSL implementation
-               #        works correctly.
-               #   Notice: Most problems of broken clients are also related to the HTTP
-               #   keep-alive facility, so you usually additionally want to disable
-               #   keep-alive for those clients, too. Use variable "nokeepalive" for this.
-               #   Similarly, one has to force some clients to use HTTP/1.0 to workaround
-               #   their broken HTTP/1.1 implementation. Use variables "downgrade-1.0" and
-               #   "force-response-1.0" for this.
-               # BrowserMatch "MSIE [2-6]" \
-               #               nokeepalive ssl-unclean-shutdown \
-               #               downgrade-1.0 force-response-1.0
-
-       </VirtualHost>
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
index 5a9cd835b3e51ab1089576d8739457ca1ff7ad93..8d4e40a0e55f0b073b0b1d1ea4b39d187c09f88b 100644 (file)
@@ -1,7 +1,6 @@
 <VirtualHost *:80>
        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]
index f3c28d25c7988e2c541724828cf5ee7c91a98985..bc4ca88ba3f0ccad328280822a29a1fc1ea4107f 100644 (file)
@@ -1,44 +1,39 @@
 <VirtualHost *:80>
        ServerName www.giorgioravera.it
        ServerAdmin giorgio@giorgioravera.it
+       RewriteEngine on
+       RewriteCond %{HTTPS} !=on
+       RewriteRule .* https://%{SERVER_NAME}%{REQUEST_URI} [NE,R,L]
+</VirtualHost>
 
-       DocumentRoot /var/www/www.giorgioravera.it/htdocs
-       <Directory /var/www/astal.giorgioravera.it/htdocs>
-               AllowOverride All
-       </Directory>
-       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
+<IfModule mod_ssl.c>
+       <VirtualHost *:443>
+               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
+               <Directory /var/www/www.giorgioravera.it/htdocs>
+                       Options FollowSymlinks
+                       AllowOverride All
+               </Directory>
+               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
 
-       <IfModule mod_cband.c>
-               # 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
-       </IfModule> 
-</VirtualHost>
+               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
+       </VirtualHost>
+</IfModule>