From 522e8d71cc89e670cb33d3b3bdb311d478397860 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Oct 2020 20:47:48 +0200 Subject: fix separate default vhost 0_default from (new) example vhost zzz_wrong.example.com --- apache2/sites-available/0_default.conf | 28 ++++++++++++---------- apache2/sites-available/zzz_wrong.example.com.conf | 19 +++++++++++++++ 2 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 apache2/sites-available/zzz_wrong.example.com.conf (limited to 'apache2') diff --git a/apache2/sites-available/0_default.conf b/apache2/sites-available/0_default.conf index 2757fb9..765cc8d 100644 --- a/apache2/sites-available/0_default.conf +++ b/apache2/sites-available/0_default.conf @@ -1,19 +1,21 @@ - - ServerName wrong.example.com - ServerAlias wrong - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/wrong.example.com +Define _TLS_CERT_CHAIN /etc/ssl/certs/ssl-cert-snakeoil.pem +Define _TLS_KEY /etc/ssl/private/ssl-cert-snakeoil.key - ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined + + ServerAdmin webmaster@localhost + DocumentRoot /var/www/html + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined - - ServerName wrong.example.com - ServerAdmin webmaster@example.com - DocumentRoot /home/webmaster/public_websites/wrong.example.com + + DocumentRoot /var/www/html Include conf.d/local-ssl.conf - ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log - CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + +Undefine _TLS_CERT_CHAIN +Undefine _TLS_KEY diff --git a/apache2/sites-available/zzz_wrong.example.com.conf b/apache2/sites-available/zzz_wrong.example.com.conf new file mode 100644 index 0000000..2757fb9 --- /dev/null +++ b/apache2/sites-available/zzz_wrong.example.com.conf @@ -0,0 +1,19 @@ + + ServerName wrong.example.com + ServerAlias wrong + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/wrong.example.com + + ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined + + + ServerName wrong.example.com + ServerAdmin webmaster@example.com + DocumentRoot /home/webmaster/public_websites/wrong.example.com + + Include conf.d/local-ssl.conf + + ErrorLog ${APACHE_LOG_DIR}/wrong.example.com-error.log + CustomLog ${APACHE_LOG_DIR}/wrong.example.com-access.log combined + -- cgit v1.2.3