summaryrefslogtreecommitdiffstats
path: root/custom
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-11-09 05:25:53 +0800
committertechknowlogick <techknowlogick@gitea.io>2019-11-08 16:25:53 -0500
commit55bdc9aa38177f75fdae4cb96e98bf465d7ecb2a (patch)
tree621333fde9de8cec79dac36bcaced0e4b499dfb3 /custom
parent016a5d0438e551d4630819683dd6dc4fccb0cb51 (diff)
downloadgitea-55bdc9aa38177f75fdae4cb96e98bf465d7ecb2a.tar.gz
gitea-55bdc9aa38177f75fdae4cb96e98bf465d7ecb2a.zip
Webhook support custom proxy (#8760)
* Webhook support custom proxy * Add glob support on webhook proxy host rules * fix app.ini.sample * improve code and app.ini.sample * update cheetsheet about added webhook options
Diffstat (limited to 'custom')
-rw-r--r--custom/conf/app.ini.sample4
1 files changed, 4 insertions, 0 deletions
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample
index 33cd0506ed..17fcc0de23 100644
--- a/custom/conf/app.ini.sample
+++ b/custom/conf/app.ini.sample
@@ -511,6 +511,10 @@ DELIVER_TIMEOUT = 5
SKIP_TLS_VERIFY = false
; Number of history information in each page
PAGING_NUM = 10
+; Proxy server URL, support http://, https//, socks://, blank will follow environment http_proxy/https_proxy
+PROXY_URL =
+; Comma separated list of host names requiring proxy. Glob patterns (*) are accepted; use ** to match all hosts.
+PROXY_HOSTS =
[mailer]
ENABLED = false