]> git.giorgioravera.it Git - apache.git/commitdiff
Additional changes
authorGiorgio Ravera <giorgio.ravera@gmail.com>
Mon, 11 Aug 2025 20:48:05 +0000 (22:48 +0200)
committerGiorgio Ravera <giorgio.ravera@gmail.com>
Mon, 11 Aug 2025 20:48:05 +0000 (22:48 +0200)
sites-available/001-default-ssl.conf [changed from file to symlink]
sites-available/asterisk.giorgioravera.it.conf
sites-available/docker.giorgioravera.it.conf
sites-available/home.giorgioravera.it.conf
sites-available/phpldapadmin.conf
sites-available/pve.giorgioravera.it.conf
sites-available/webssh.giorgioravera.it.conf

deleted file mode 100644 (file)
index 44326458b7adcc059701cc29a73c95058c51af36..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,145 +0,0 @@
-<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/letsencrypt/live/server.giorgioravera.it/chain.pem
-               SSLCertificateChainFile /etc/ssl/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>
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..9935b3754e7e3f15bc66ae0c5f84c5bfa9503688
--- /dev/null
@@ -0,0 +1 @@
+default-ssl.conf
\ No newline at end of file
index 92107f2d47865c1314900d9adcf5e3a7a2ae5ce5..a07b7836ac23bc052e135cc955638cd80b6ba969 100644 (file)
@@ -9,12 +9,9 @@
                ServerName asterisk.giorgioravera.it
                ServerAdmin giorgio@giorgioravera.it
 
-               ProxyPass / http://asterisk.giorgioravera.it/
-               ProxyPassReverse / http://asterisk.giorgioravera.it/
-
-               #SSLProxyEngine on
-               #ProxyPass / https://asterisk.giorgioravera.it/
-               #ProxyPassReverse / https://asterisk.giorgioravera.it/
+               SSLProxyEngine on
+               ProxyPass / https://asterisk.giorgioravera.it/
+               ProxyPassReverse / https://asterisk.giorgioravera.it/
 
                # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
                # error, crit, alert, emerg.
index 4754a096d607d3679ed4802eb80d4eb4e8a39084..226008a798ac72df8c945d013c0bd54b9f821f77 100644 (file)
@@ -9,12 +9,12 @@
                ServerName docker.giorgioravera.it
                ServerAdmin giorgio@giorgioravera.it
 
-               ProxyPass / http://docker.giorgioravera.it:9000/
-               ProxyPassReverse / http://docker.giorgioravera.it:9000/
+               #ProxyPass / http://docker.giorgioravera.it:9000/
+               #ProxyPassReverse / http://docker.giorgioravera.it:9000/
                
-               #SSLProxyEngine on
-               #ProxyPass / https://docker.giorgioravera.it/
-               #ProxyPassReverse / https://docker.giorgioravera.it/
+               SSLProxyEngine on
+               ProxyPass / https://docker.giorgioravera.it/
+               ProxyPassReverse / https://docker.giorgioravera.it/
 
                # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
                # error, crit, alert, emerg.
index 9e192bd6683610b63edd43ee706e10876b9fe1c2..d7ee4871fe39aabf77c5460c0986679c0798a656 100644 (file)
@@ -32,8 +32,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_home.log
+               CustomLog ${APACHE_LOG_DIR}/access_home.log combined
 
                # For most configuration files from conf-available/, which are
                # enabled or disabled at a global level, it is possible to
index a279ac52e74622a0fb32f5b5c0c10d3faaf4c71f..ed7777cf1bdd22dde650b37eeafab3506396a7b5 100644 (file)
@@ -9,7 +9,7 @@
                ServerName ldap.giorgioravera.it
                ServerAdmin giorgio@giorgioravera.it
 
-               DocumentRoot /usr/share/phpldapadmin/
+               DocumentRoot /usr/share/phpldapadmin/htdocs
 
                # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
                # error, crit, alert, emerg.
index 10feeda15448d9414b9e0aa4a75ec286216bce7d..c1a9bb1d92c5f8daf53ae661122a2fa15cf7e040 100644 (file)
@@ -23,8 +23,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_pve.log
+               CustomLog ${APACHE_LOG_DIR}/access_pve.log combined
 
                # For most configuration files from conf-available/, which are
                # enabled or disabled at a global level, it is possible to
index 1ace5e5b6dec35a54ac514341b01dc77825fd9ae..d7989f3f93dcfe71e912a00027fba0a6a2e41706 100644 (file)
@@ -45,8 +45,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_webssh.log
+               CustomLog ${APACHE_LOG_DIR}/access_webssh.log combined
 
                # For most configuration files from conf-available/, which are
                # enabled or disabled at a global level, it is possible to