changes to vserverctl

diff --git a/profile/base/aptsources b/profile/base/aptsources
index 09e8e7bdf11efd573d06b8c335d542efd1fffd0e..e7b5c62e9a100951363e39dc5dfb71ee1516d337 100644 (file)
--- a/profile/base/aptsources
+++ b/profile/base/aptsources
@@ -1,8 +1,8 @@
 # Citylink Mirror
-#deb http://ftp.nz.debian.org/debian/ etch main non-free
-#deb-src http://ftp.nz.debian.org/debian/ etch main
-deb http://debian.catalyst.net.nz/debian/ etch main non-free
-deb-src http://debian.catalyst.net.nz/debian/ etch main
+deb http://ftp.uk.debian.org/debian/ etch main non-free
+deb-src http://ftp.uk.debian.org/debian/ etch main
+#deb http://debian.catalyst.net.nz/debian/ etch main non-free
+#deb-src http://debian.catalyst.net.nz/debian/ etch main
 
 # Catalyst Packages
 deb http://debian.catalyst.net.nz/catalyst stable catalyst

diff --git a/profile/web/data/vhost b/profile/web/data/vhost
index 52ce5127c38919bd2eea413828fb928858eac1a6..4500cc30a8fe260d992efcebd12a2664668cde81 100644 (file)
--- a/profile/web/data/vhost
+++ b/profile/web/data/vhost
@@ -1,6 +1,6 @@
 <VirtualHost *>
-    ServerName __VSNAME__.__HOST__.wgtn.cat-it.co.nz
-    ServerAlias *.__VSNAME__.__HOST__.wgtn.cat-it.co.nz
+    ServerName __VSNAME__.__HOST__
+    ServerAlias *.__VSNAME__.__HOST__
 
     VirtualDocumentRoot /var/www/web/%1
     

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