From: Roland Mas <lolando@debian.org>
Date: Wed, 7 Nov 2012 13:18:41 +0000 (+0100)
Subject: Prettify URLs
X-Git-Tag: v5.3-rc1~1785
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=17e7326f2f835f42b4e99c86ac4d7cf9396435e7;ds=sidebyside

Prettify URLs
---

diff --git a/src/etc/httpd.conf.d/plugin-scmbzr.inc b/src/etc/httpd.conf.d/plugin-scmbzr.inc
index dabfc6220d..55d74334f9 100644
--- a/src/etc/httpd.conf.d/plugin-scmbzr.inc
+++ b/src/etc/httpd.conf.d/plugin-scmbzr.inc
@@ -1,10 +1,10 @@
-Alias {core/url_prefix}/scm/loggerhead/static /usr/share/loggerhead/static
+Alias {core/url_prefix}scm/loggerhead/static /usr/share/loggerhead/static
 RewriteEngine On
-RewriteRule ^{core/url_prefix}/scm/loggerhead$ {core/url_prefix}/scm/loggerhead/ [R]
+RewriteRule ^{core/url_prefix}scm/loggerhead$ {core/url_prefix}scm/loggerhead/ [R]
 
-WSGIScriptAlias {core/url_prefix}/scm/loggerhead /usr/bin/loggerhead.wsgi
+WSGIScriptAlias {core/url_prefix}scm/loggerhead /usr/bin/loggerhead.wsgi
 
-<Location {core/url_prefix}/scm/loggerhead>
+<Location {core/url_prefix}scm/loggerhead>
     WSGIProcessGroup fusionforge-plugin-scmbzr
     Order deny,allow
     Allow from all
diff --git a/src/plugins/scmbzr/bin/install.sh b/src/plugins/scmbzr/bin/install.sh
index a10d69c5e3..ca9829bbcc 100644
--- a/src/plugins/scmbzr/bin/install.sh
+++ b/src/plugins/scmbzr/bin/install.sh
@@ -30,10 +30,10 @@ case "$1" in
 	    cat > $configfile <<EOF
 # Directory to serve bzr branches from
 # Non-bzr directories under this path will also be visible in loggerhead
-http_root_dir = '$repos_path'
+http_root_dir = '${repos_path}'
 
 # The url prefix for the bzr branches.
-http_user_prefix = 'http://$web_host/$url_prefix/scm/loggerhead'
+http_user_prefix = 'http://${web_host}${url_prefix}scm/loggerhead'
 
 # Directory to put cache files in
 http_sql_dir = '/var/cache/gforge/loggerhead'