Template more stuff for the vserver apache config template.

diff --git a/profile/webserver/post-host b/profile/webserver/post-host
index fd8003aa347765d662d165cad635a9b0c4ecc9f9..07f50f214bd924c9b0f45947d49f6004d0e3eee3 100644 (file)
--- 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