Move static content out of document root

This will allow multiple trackers to share a host more easily.

diff --git a/CGI/bugs.pl b/CGI/bugs.pl
index 3a09d24679cfc59f3068d3d959d4329567a00166..c3b5c3a93098e85b3969678e1ddf968aef3df283 100755 (executable)
--- a/CGI/bugs.pl
+++ b/CGI/bugs.pl
@@ -78,7 +78,7 @@ print p(
           . ". "
           . "Information on the control syntax is available "
           . a(
-            { -href => "http://" . $c{TrackerHost} . "/control.txt" }, "here"
+            { -href => "http://" . $c{TrackerHost} . $c{StaticContent} . "control.txt" }, "here"
           )
           . "."
     ]

diff --git a/config/examples/test/apache.conf b/config/examples/test/apache.conf
index 2d1aa88759eb32aa0d3441ae0d9168a8682e2594..47924233796ea91701c4774efe3614e3cdb2abcc 100644 (file)
--- a/config/examples/test/apache.conf
+++ b/config/examples/test/apache.conf
@@ -1,4 +1,6 @@
 # Insert into /etc/apache2/sites-available/bugs.xenproject.org
+       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
        ScriptAlias /test/ /srv/test/lib/emesinae/cgi-bin/bugs.cgi
        <Directory "/srv/test/lib/emesinae/cgi-bin">
@@ -9,5 +11,3 @@
                SetEnv PERLLIB /srv/test/share/perl/5.10.1/
                AuthUserFile /srv/test/etc/htpasswd
        </Directory>
-
-       Alias /test-css/ /srv/test/share/emesinae/css/

diff --git a/config/examples/test/emesinae.conf b/config/examples/test/emesinae.conf
index 6b802701500d3bbd6a2b51d2afcd064e6eaa5cc4..ca302a6ffeca9094f9b85419f04b66327efcd7a7 100644 (file)
--- a/config/examples/test/emesinae.conf
+++ b/config/examples/test/emesinae.conf
@@ -4,9 +4,7 @@ $c{DB}          = "/srv/test/var/run/db.sqlite";
 $c{RawMailBase} = "/srv/test/var/raw/";
 
 $c{TrackerName} = "Emesinae Testing Bug Tracker";
-$c{TrackerHost} = "bugs.xen.org";
-
-$c{StyleSheet} = "/test-css/style.css";
+$c{TrackerHost} = "bugs.xenproject.org";
 
 $c{MailDomain} = "bugs.xenproject.org";
 
@@ -41,6 +39,8 @@ $c{ArchiveIncoming} = 1;
 
 # Path component of the CGI URL
 $c{CGIPath}         = "/test/";
+$c{StyleSheet}      = "/test/css/style.css";
+$c{StaticContent}   = "/test/static/";
 
 $c{LockDir}  = "/srv/test/var/lock";
 

diff --git a/config/examples/xen-bugs.xenproject.org/apache.conf b/config/examples/xen-bugs.xenproject.org/apache.conf
index 6beab76ffd77e67615858a70ca1c2e4bafe659f8..b1e7c33e6717fa53dc88a8ab4c5df3826a489002 100644 (file)
--- a/config/examples/xen-bugs.xenproject.org/apache.conf
+++ b/config/examples/xen-bugs.xenproject.org/apache.conf
@@ -3,7 +3,7 @@
        ServerAdmin webmaster@bugs.xenproject.org
        ServerName bugs.xenproject.org
 
-       DocumentRoot /srv/xen-devel-bugs/var/www
+       DocumentRoot /var/www
        <Directory />
                Options FollowSymLinks
                AllowOverride None
@@ -15,13 +15,9 @@
                AuthUserFile /srv/xen-devel-bugs/etc/htpasswd
                Require valid-user
        </Directory>
-       <Directory /srv/xen-devel-bugs/var/www/>
-               Options Indexes FollowSymLinks MultiViews
-               AllowOverride None
-               Order allow,deny
-               allow from all
-       </Directory>
 
+       Alias /xen/css/ /srv/xen-devel-bugs/share/emesinae/css/
+       Alias /xen/static/ /srv/xen-devel-bugs/var/www/
        ScriptAliasMatch /xen/bug/.* /srv/xen-devel-bugs/lib/emesinae/cgi-bin/bug.cgi
        ScriptAlias /xen/ /srv/xen-devel-bugs/lib/emesinae/cgi-bin/bugs.cgi
        <Directory "/srv/xen-devel-bugs/lib/emesinae/cgi-bin">
@@ -32,8 +28,6 @@
                SetEnv PERLLIB /srv/xen-devel-bugs/share/perl/5.10.1/
        </Directory>
 
-       Alias /css/ /srv/xen-devel-bugs/share/emesinae/css/
-
        ErrorLog ${APACHE_LOG_DIR}/error.log
 
        # Possible values include: debug, info, notice, warn, error, crit,

diff --git a/config/examples/xen-bugs.xenproject.org/emesinae.conf b/config/examples/xen-bugs.xenproject.org/emesinae.conf
index 82bdaad5eeb709f900354114a55b4e0afd7cb74f..22e163f9188d561b05580ba079a46c55c6cae79b 100644 (file)
--- a/config/examples/xen-bugs.xenproject.org/emesinae.conf
+++ b/config/examples/xen-bugs.xenproject.org/emesinae.conf
@@ -41,6 +41,8 @@ $c{ArchiveIncoming} = 1;
 
 # Path component of the CGI URL
 $c{CGIPath}         = "/xen/";
+$c{StyleSheet}      = "/xen/css/style.css";
+$c{StaticContent}   = "/xen/static/";
 
 $c{LockDir} = "/srv/xen-devel-bugs/var/lock/";