Run test bug installation on a separate vhost.

diff --git a/config/examples/test/apache.conf b/config/examples/test/apache.conf
index 47924233796ea91701c4774efe3614e3cdb2abcc..c7a85456680c480eec7c375186df50543d715e2c 100644 (file)
--- a/config/examples/test/apache.conf
+++ b/config/examples/test/apache.conf
@@ -1,4 +1,19 @@
-# Insert into /etc/apache2/sites-available/bugs.xenproject.org
+<VirtualHost *:80>
+       ServerAdmin webmaster@bugs.xenproject.org
+       ServerName bugs-test.xenproject.org
+
+       DocumentRoot /var/www
+       <Directory />
+               Options FollowSymLinks
+               AllowOverride None
+
+               # Require authentication while we are in beta
+               AuthType Basic
+               AuthName "Restricted"
+               AuthUserFile /srv/xen-devel-bugs/etc/htpasswd
+               Require valid-user
+       </Directory>
+
        Alias /test/css/ /srv/test/share/emesinae/css/
        Alias /test/static/ /srv/test/var/www/
        ScriptAliasMatch /test/bug/.* /srv/test/lib/emesinae/cgi-bin/bug.cgi
@@ -11,3 +26,12 @@
                SetEnv PERLLIB /srv/test/share/perl/5.10.1/
                AuthUserFile /srv/test/etc/htpasswd
        </Directory>
+
+       ErrorLog ${APACHE_LOG_DIR}/error.log
+
+       # Possible values include: debug, info, notice, warn, error, crit,
+       # alert, emerg.
+       LogLevel warn
+
+       CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>

diff --git a/config/examples/xen-bugs.xenproject.org/apache.conf b/config/examples/xen-bugs.xenproject.org/apache.conf
index b1e7c33e6717fa53dc88a8ab4c5df3826a489002..37ea9bdfeeaa444706ebe709e6ade0da72194355 100644 (file)
--- a/config/examples/xen-bugs.xenproject.org/apache.conf
+++ b/config/examples/xen-bugs.xenproject.org/apache.conf
@@ -1,5 +1,5 @@
 # Copy to /etc/apache2/sites-available/bugs.xenproject.org
-<VirtualHost bugs.xenproject.org:80>
+<VirtualHost *:80>
        ServerAdmin webmaster@bugs.xenproject.org
        ServerName bugs.xenproject.org
 
@@ -8,7 +8,6 @@
                Options FollowSymLinks
                AllowOverride None
 
-
                # Require authentication while we are in beta
                AuthType Basic
                AuthName "Restricted"