diff options
| author | Unknwon <u@gogs.io> | 2015-07-09 11:15:08 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-07-09 11:15:08 +0800 |
| commit | b60fd3aaadc3e6ad227b663d599e073f1436fd1f (patch) | |
| tree | 3aa7a1e26cd878c09a52078d5aa202489122f27c /modules/setting/setting.go | |
| parent | 3be3b8faa7b1fa8fcac0bec49f2a37e861b4353d (diff) | |
| parent | 4fca548ed11cefedcaa595be1c08625a9ae9f878 (diff) | |
Merge branch 'master' of github.com:gogits/gogs
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index aefc3520..48a5dd35 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -53,6 +53,7 @@ var ( HttpAddr, HttpPort string DisableSSH bool SSHPort int + SSHDomain string OfflineMode bool DisableRouterLog bool CertFile, KeyFile string @@ -232,6 +233,7 @@ func NewConfigContext() { HttpAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0") HttpPort = sec.Key("HTTP_PORT").MustString("3000") DisableSSH = sec.Key("DISABLE_SSH").MustBool() + SSHDomain = sec.Key("SSH_DOMAIN").MustString(Domain) SSHPort = sec.Key("SSH_PORT").MustInt(22) OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() @@ -476,6 +478,8 @@ type Mailer struct { Host string From string User, Passwd string + DisableHelo bool + HeloHostname string SkipVerify bool UseCertificate bool CertFile, KeyFile string @@ -510,6 +514,8 @@ func newMailService() { Host: sec.Key("HOST").String(), User: sec.Key("USER").String(), Passwd: sec.Key("PASSWD").String(), + DisableHelo: sec.Key("DISABLE_HELO").MustBool(), + HeloHostname: sec.Key("HELO_HOSTNAME").String(), SkipVerify: sec.Key("SKIP_VERIFY").MustBool(), UseCertificate: sec.Key("USE_CERTIFICATE").MustBool(), CertFile: sec.Key("CERT_FILE").String(), |