diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.ini | 65 | ||||
| -rw-r--r-- | conf/locale/locale_en-US.ini | 28 |
2 files changed, 52 insertions, 41 deletions
diff --git a/conf/app.ini b/conf/app.ini index baec9d32..063ef4a9 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -167,6 +167,40 @@ ENABLE_LOGIN_STATUS_COOKIE = false ; The cookie name to store user login status. LOGIN_STATUS_COOKIE_NAME = login_status +[email] +; Whether to enable the email service. +ENABLED = false +; The prefix prepended to the subject line. +SUBJECT_PREFIX = `[%(BRAND_NAME)s] ` +; The SMTP server with its port, e.g. smtp.mailgun.org:587, smtp.gmail.com:587, smtp.qq.com:465 +; If the port ends is "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. +; If the server supports STARTTLS it will always be used. +HOST = smtp.mailgun.org:587 +; The email from address (RFC 5322). This can be just an email address, or the `"Name" <email@example.com>` format. +FROM = noreply@gogs.localhost +; The login user. +USER = noreply@gogs.localhost +; The login password. +PASSWORD = + +; Whether to disable HELO operation when the hostname is different. +DISABLE_HELO = +; The custom hostname for HELO operation, default is from system. +HELO_HOSTNAME = + +; Whether to skip verifying the certificate of the server. Only use this for self-signed certificates. +SKIP_VERIFY = false +; Whether to use client certificates. +USE_CERTIFICATE = false +CERT_FILE = custom/email/cert.pem +KEY_FILE = custom/email/key.pem + +; Whether to use "text/plain" as content format. +USE_PLAIN_TEXT = false +; Whether to attach a plaintext alternative to the MIME message while sending HTML emails. +; It is used to support older mail clients and make spam filters happier. +ADD_PLAIN_TEXT_ALT = false + ; Attachment settings for releases [release.attachment] ; Whether attachments are enabled. Defaults to `true` @@ -234,37 +268,6 @@ SKIP_TLS_VERIFY = false ; Number of history information in each page PAGING_NUM = 10 -[mailer] -ENABLED = false -; Buffer length of channel, keep it as it is if you don't know what it is. -SEND_BUFFER_LEN = 100 -; Prefix prepended to the subject line -SUBJECT_PREFIX = `[%(BRAND_NAME)s] ` -; Mail server -; Gmail: smtp.gmail.com:587 -; QQ: smtp.qq.com:465 -; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used. -HOST = -; Disable HELO operation when hostname are different. -DISABLE_HELO = -; Custom hostname for HELO operation, default is from system. -HELO_HOSTNAME = -; Do not verify the certificate of the server. Only use this for self-signed certificates -SKIP_VERIFY = -; Use client certificate -USE_CERTIFICATE = false -CERT_FILE = custom/mailer/cert.pem -KEY_FILE = custom/mailer/key.pem -; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format -FROM = -; Mailer user name and password -USER = -PASSWD = -; Use text/plain as format of content -USE_PLAIN_TEXT = false -; If sending html emails, then also attach a plaintext alternative to the MIME message, to support older mail clients and make spam filters happier. -ADD_PLAIN_TEXT_ALT = false - [cache] ; Either "memory", "redis", or "memcache", default is "memory" ADAPTER = memory diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 4de1c794..79d2b7bf 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -1235,6 +1235,24 @@ config.security.reverse_proxy_auth_user = Reverse proxy authentication header config.security.enable_login_status_cookie = Enable login status cookie config.security.login_status_cookie_name = Login status cookie +config.email_config = Email configuration +config.email.enabled = Enabled +config.email.subject_prefix = Subject prefix +config.email.host = Host +config.email.from = From +config.email.user = User +config.email.disable_helo = Disable HELO +config.email.helo_hostname = HELO hostname +config.email.skip_verify = Skip certificate verify +config.email.use_certificate = Use custom certificate +config.email.cert_file = Certificate file +config.email.key_file = Key file +config.email.use_plain_text = Use plain text +config.email.add_plain_text_alt = Add plain text alternative +config.email.send_test_mail = Send test email +config.email.test_mail_failed = Failed to send test email to '%s': %v +config.email.test_mail_sent = Test email has been sent to '%s'. + config.log_file_root_path = Log File Root Path config.http_config = HTTP Configuration @@ -1256,16 +1274,6 @@ config.queue_length = Queue Length config.deliver_timeout = Deliver Timeout config.skip_tls_verify = Skip TLS Verify -config.mailer_config = Mailer Configuration -config.mailer_enabled = Enabled -config.mailer_disable_helo = Disable HELO -config.mailer_subject_prefix = Subject Prefix -config.mailer_host = Host -config.mailer_user = User -config.send_test_mail = Send Test Email -config.test_mail_failed = Failed to send test email to '%s': %v -config.test_mail_sent = Test email has been sent to '%s'. - config.oauth_config = OAuth Configuration config.oauth_enabled = Enabled |