User genericity

diff --git a/profile/webserver/vservers.template.conf b/profile/webserver/vservers.template.conf
index 2e8c10533c4ef09da7a03c4762d97ba033406896..3069f001773145cb8028889129401355b2bd2bf4 100644 (file)
--- a/profile/webserver/vservers.template.conf
+++ b/profile/webserver/vservers.template.conf
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
-    ServerAdmin martyn@catalyst.net.nz
-    ServerName  __NAME__.abelard.wgtn.cat-it.co.nz
-    ServerAlias *.__NAME__.abelard.wgtn.cat-it.co.nz
+    ServerAdmin __PROFILEOPTION_username__@catalyst.net.nz
+    ServerName  __NAME__.__HOSTNAME__.wgtn.cat-it.co.nz
+    ServerAlias *.__NAME__.__HOSTNAME__.wgtn.cat-it.co.nz
 
     LogLevel warn
     ErrorLog /var/log/apache2/vserver.__NAME__.error.log
@@ -16,14 +16,13 @@
 
     ProxyPreserveHost On
     ProxyPass / http://__IPADDR__/
-    AllowEncodedSlashes On
 </VirtualHost>
 <VirtualHost *:80>
-    ServerName __NAME__.abelard
-    ServerAlias *.__NAME__.abelard
+    ServerName __NAME__.__HOSTNAME__
+    ServerAlias *.__NAME__.__HOSTNAME__
 
     RewriteEngine On
 
-    RewriteCond   %{HTTP_HOST} ^(.*)__NAME__.abelard$
-    RewriteRule   ^(.*)$       http://%1__NAME__.abelard.wgtn.cat-it.co.nz$1 [L,R=301]
+    RewriteCond   %{HTTP_HOST} ^(.*)__NAME__.__HOSTNAME__$
+    RewriteRule   ^(.*)$       http://%1__NAME__.__HOSTNAME__.wgtn.cat-it.co.nz$1 [L,R=301]
 </VirtualHost>