summaryrefslogtreecommitdiffstats
path: root/src/main/distrib/data
diff options
context:
space:
mode:
authorDariusz Bywalec <dariusz.bywalec@trapezegroup.pl>2014-12-02 17:11:50 +0100
committerDariusz Bywalec <dariusz.bywalec@trapezegroup.pl>2014-12-02 17:30:14 +0100
commitd86f4a0860704e3bda77fa9622a8d0210265b616 (patch)
tree4e8e4cb912d6d6024e94dc1bb9efd90c44e7b6c2 /src/main/distrib/data
parent9f92fb94aa403928a2efe5e673e118b3b02ba291 (diff)
downloadgitblit-d86f4a0860704e3bda77fa9622a8d0210265b616.tar.gz
gitblit-d86f4a0860704e3bda77fa9622a8d0210265b616.zip
Add support for configurable HTTP proxy host/port in PluginManager.java
Formerly by default the PluginMaganer would support no proxy setting. For servers behind firewall and HTTP proxy this would prevent installation of gitblit plugins.
Diffstat (limited to 'src/main/distrib/data')
-rw-r--r--src/main/distrib/data/defaults.properties10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index aa69331a..093dd857 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -572,6 +572,16 @@ plugins.folder = ${baseFolder}/plugins
# SINCE 1.5.0
plugins.registry = http://plugins.gitblit.com/plugins.json
+# The HTTP proxy host for plugin manager.
+#
+# SINCE 1.7.0
+plugins.httpProxyHost =
+
+# The HTTP proxy port for plugin manager.
+#
+# SINCE 1.7.0
+plugins.httpProxyPort =
+
# Number of threads used to handle miscellaneous tasks in the background.
#
# SINCE 1.6.0