From: Roland Mas <lolando@debian.org>
Date: Fri, 9 Nov 2012 17:05:24 +0000 (+0100)
Subject: Honor use_ssl for loggerhead
X-Git-Tag: v5.3-rc1~1770
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=9288bc959c0be5cf59495fdc174671a651aecadc;ds=sidebyside

Honor use_ssl for loggerhead
---

diff --git a/src/plugins/scmbzr/bin/install.sh b/src/plugins/scmbzr/bin/install.sh
index 5aef04e..c5d782e 100644
--- a/src/plugins/scmbzr/bin/install.sh
+++ b/src/plugins/scmbzr/bin/install.sh
@@ -19,7 +19,13 @@ case "$1" in
 	repos_path=$(forge_get_config repos_path scmbzr)
 	web_host=$(forge_get_config web_host)
 	url_prefix=$(forge_get_config url_prefix)
+	use_ssl=$(forge_get_config use_ssl)
 
+	if [ -z "$use_ssl" ] || [ "$use_ssl" = no ] ; then
+	    http_user_prefix=http://${web_host}${url_prefix}scm/loggerhead
+	else
+	    http_user_prefix=https://${web_host}${url_prefix}scm/loggerhead
+	fi
 	a2enmod wsgi
 	if [ ! -e $configfile ] ; then
 	    mkdir -p $(dirname $configfile)
@@ -29,7 +35,7 @@ case "$1" in
 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_user_prefix}'
 
 # Directory to put cache files in
 http_sql_dir = '/var/cache/gforge/loggerhead'