changes to suit my setup in php5 profile

diff --git a/profile/php5/data/htdocs b/profile/php5/data/htdocs
index 0109bdf0150f036daee1e52bd33698c89d65cc69..17556ef32ced044a3997c0c3fbff596ba875ab85 100644 (file)
--- a/profile/php5/data/htdocs
+++ b/profile/php5/data/htdocs
@@ -1,6 +1,6 @@
 <VirtualHost *>
     ServerName __VSNAME__.__HOST__.wgtn.cat-it.co.nz
 
-    DocumentRoot /home/__PROFILEOPTION_username__/htdocs
+    DocumentRoot /var/www/__VSNAME__/htdocs
 
 </VirtualHost>

diff --git a/profile/php5/post-vserver b/profile/php5/post-vserver
index b9ed14096da2977a6448ec89ae9c90386196f9ca..20a0e0162fb5c8c3f86e4c58cf9a62424cf629b2 100644 (file)
--- a/profile/php5/post-vserver
+++ b/profile/php5/post-vserver
@@ -1,13 +1,8 @@
 USR=$PROFILEOPTION_username
 rm /etc/apache2/sites-enabled/000-default
 
-ln -s /etc/apache2/sites-available/htdocs-$USR /etc/apache2/sites-enabled/100-htdocs-$USR
+ln -s /etc/apache2/sites-available/htdocs /etc/apache2/sites-enabled/100-htdocs
 
 echo 'NameVirtualHost *' > /etc/apache2/sites-enabled/000-namevirtualhost
 
-mkdir /home/$USR/htdocs
-echo '<?php phpinfo(); ?>' > /home/$USR/htdocs/index.php
-
-chown -R $USR:$USR /home/$USR/htdocs
-
 apache2ctl graceful