summaryrefslogtreecommitdiffstats
path: root/options
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 /options
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 'options')
-rw-r--r--options/locale/locale_en-US.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index a6c5d41978..fe68573529 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -2119,6 +2119,7 @@ config.mailer_user = User
config.mailer_use_sendmail = Use Sendmail
config.mailer_sendmail_path = Sendmail Path
config.mailer_sendmail_args = Extra Arguments to Sendmail
+config.mailer_sendmail_timeout = Sendmail Timeout
config.send_test_mail = Send Testing Email
config.test_mail_failed = Failed to send a testing email to '%s': %v
config.test_mail_sent = A testing email has been sent to '%s'.