Added a script to facilitate setting the proxy host and port and no proxy hosts,...

diff --git a/distrib/gitblit b/distrib/gitblit
index 3fda9ebdf3cee1177a7957243290719fade032b1..cd1f967e3ba845446d91fd8a73520cf72a866723 100644 (file)
--- a/distrib/gitblit
+++ b/distrib/gitblit
@@ -5,7 +5,8 @@ set -e
 GITBLIT_PATH=/opt/gitblit
 GITBLIT_HTTP_PORT=0
 GITBLIT_HTTPS_PORT=8443
-JAVA="java -server -Xmx1024M -jar"
+source ${GITBLIT_PATH}/java-proxy-config.sh
+JAVA="java -server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar"
 
 . /lib/lsb/init-functions
 

diff --git a/distrib/gitblit-centos b/distrib/gitblit-centos
index c9fe151e76dd566e60476e71a1b5c257ba457772..c608097e632a50fec084c43c7c3f7561049dfecb 100644 (file)
--- a/distrib/gitblit-centos
+++ b/distrib/gitblit-centos
@@ -8,7 +8,8 @@
 GITBLIT_PATH=/opt/gitblit
 GITBLIT_HTTP_PORT=0
 GITBLIT_HTTPS_PORT=8443
-JAVA="java -server -Xmx1024M -jar"
+source ${GITBLIT_PATH}/java-proxy-config.sh
+JAVA="java -server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar"
 
 RETVAL=0
 

diff --git a/distrib/gitblit-ubuntu b/distrib/gitblit-ubuntu
index 957a8d054311bf15e20cf360bc73280328ebe7d9..b047ed97804af01de6f6856c6affb142e157687c 100644 (file)
--- 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

diff --git a/distrib/java-proxy-config.sh b/distrib/java-proxy-config.sh
new file mode 100644 (file)
index 0000000..5f7a2a2
--- /dev/null
+++ b/distrib/java-proxy-config.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# To set the proxy configuration, specify the following host name and port
+#PROXY_HOST=
+#PROXY_PORT=
+
+# To exclude any hosts from proxy configuration such that they directly accessed by Gitblit without passing through the proxy server, append the host name to the following variable using "|" as the separator
+NON_PROXY_HOSTS="localhost|127.0.0.*|*.local|192.168.*.*|10.193.*.*"
+
+### The following should not need to be modified
+
+JAVA_PROXY_CONFIG=""
+
+if [ -n "${PROXY_HOST}" -a -n "${PROXY_PORT}" ]; then
+
+    JAVA_PROXY_CONFIG=" -DproxySet=true -Dhttp.proxyHost=${PROXY_HOST} -Dhttp.proxyPort=${PROXY_PORT} -Dhttps.proxyHost=${PROXY_HOST} -Dhttps.proxyPort=${PROXY_PORT} -Dftp.proxyHost=${PROXY_HOST} -Dftp.proxyPort=${PROXY_PORT} "
+fi
+
+if [ -n "${PROXY_HOST}" -a -n "${PROXY_PORT}" -a -n "${NON_PROXY_HOSTS}" ]; then
+
+    JAVA_PROXY_CONFIG="${JAVA_PROXY_CONFIG} -Dhttp.nonProxyHosts=\"${NON_PROXY_HOSTS}\" -Dftp.nonProxyHosts=\"${NON_PROXY_HOSTS}\" "
+fi
+
+export JAVA_PROXY_CONFIG
+