summaryrefslogtreecommitdiffstats
path: root/custom/conf
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-05-03 00:04:31 +0100
committerGitHub <noreply@github.com>2020-05-03 00:04:31 +0100
commit4f9d59be17de6714b33e59d89a64c175aaed9381 (patch)
treeb48c2091b12d8c07ef35618371505194b459ded0 /custom/conf
parent319eb8311204675aeb9ece3fbb8e25c8b3e8a98b (diff)
downloadgitea-4f9d59be17de6714b33e59d89a64c175aaed9381.tar.gz
gitea-4f9d59be17de6714b33e59d89a64c175aaed9381.zip
Sendmail should create a process on the gitea system and have a default timeout (#11256)
* Make sure that sendmail processes register with the process manager * Provide a timeout for these (initially of 5 minutes) * Add configurable value and tie in to documentation * Tie in to the admin config page. Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'custom/conf')
-rw-r--r--custom/conf/app.ini.sample2
1 files changed, 2 insertions, 0 deletions
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample
index 8900a58342..0c29932d92 100644
--- a/custom/conf/app.ini.sample
+++ b/custom/conf/app.ini.sample
@@ -649,6 +649,8 @@ MAILER_TYPE = smtp
SENDMAIL_PATH = sendmail
; Specify any extra sendmail arguments
SENDMAIL_ARGS =
+; Timeout for Sendmail
+SENDMAIL_TIMEOUT = 5m
[cache]
; if the cache enabled