From e73d8dc6a9f94304ea65a03cba735d23f089ea8e Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 1 Aug 2019 11:29:09 +0100
Subject: [PATCH] Overwrite the default apache vhost config
---
build.sh | 3 +--
conf/apache2/sites-available/{lurker.conf => 000-default.conf} | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
rename conf/apache2/sites-available/{lurker.conf => 000-default.conf} (97%)
diff --git a/build.sh b/build.sh
index be37b88..ca2a7de 100755
--- a/build.sh
+++ b/build.sh
@@ -29,8 +29,7 @@ install_packages ${PACKAGES} \
# Enable the apache modules we need.
a2enmod -q cgi rewrite
-# Enable the lurker vhost.
-a2ensite lurker
+# No need to enable the default apache vhost.
# Create mountpoint dirs.
mkdir -p /var/lib/lurker
diff --git a/conf/apache2/sites-available/lurker.conf b/conf/apache2/sites-available/000-default.conf
similarity index 97%
rename from conf/apache2/sites-available/lurker.conf
rename to conf/apache2/sites-available/000-default.conf
index 41375b6..d3133d4 100644
--- a/conf/apache2/sites-available/lurker.conf
+++ b/conf/apache2/sites-available/000-default.conf
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:${APACHE_PORT}>
ServerAdmin webmaster@${DOMAIN}
ServerName lists.${DOMAIN}
DocumentRoot /var/lib/lurker/www
--
GitLab