From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001 From: Mohamed Ragab Date: Wed, 2 May 2012 17:15:01 +0200 Subject: Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command --- distrib/gitblit-ubuntu | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'distrib/gitblit-ubuntu') diff --git a/distrib/gitblit-ubuntu b/distrib/gitblit-ubuntu index 957a8d05..b047ed97 100644 --- a/distrib/gitblit-ubuntu +++ b/distrib/gitblit-ubuntu @@ -9,7 +9,8 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin # change theses values (default values) GITBLIT_PATH=/opt/gitblit GITBLIT_USER="gitblit" -ARGS="-server -Xmx1024M -jar gitblit.jar" +source ${GITBLIT_PATH}/java-proxy-config.sh +ARGS="-server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar gitblit.jar" RETVAL=0 @@ -43,4 +44,4 @@ case "$1" in ;; esac -exit $RETVAL \ No newline at end of file +exit $RETVAL -- cgit v1.2.3