From: Nigel McNie <nigel@catalyst.net.nz>
Date: Mon, 14 May 2007 10:47:06 +0000 (+1200)
Subject: Template more stuff for the vserver apache config template.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=781f28d32093b54b71132db1e0842b724d999992;p=vserverctl.git

Template more stuff for the vserver apache config template.
---

diff --git a/profile/webserver/post-host b/profile/webserver/post-host
index fd8003a..07f50f2 100644
--- a/profile/webserver/post-host
+++ b/profile/webserver/post-host
@@ -1,4 +1,5 @@
 # Add Apache Host Config
 [ -d /etc/apache2/vservers ] || mkdir -p /etc/apache2/vservers
-cat /vserver/.profile/webserver/vservers.template.conf | sed "s/__IPADDR__/${VSIPADDR}/" | sed "s/__NAME__/${VSNAME}/" > /etc/apache2/vservers/${VSNAME}.conf
+# Note: HOSTNAME is used here instead of HOST because HOST is templated by vserverctl
+cat /vserver/.profile/webserver/vservers.template.conf | sed "s/__IPADDR__/${VSIPADDR}/" | sed "s/__NAME__/${VSNAME}/" | sed "s/__HOSTNAME__/`hostname`/" | sed "s/__PROFILEOPTION_username__/${PROFILEOPTION_username}/" > /etc/apache2/vservers/${VSNAME}.conf
 apache2ctl graceful