diff options
| author | 无闻 <u@gogs.io> | 2015-02-08 20:22:02 -0500 |
|---|---|---|
| committer | 无闻 <u@gogs.io> | 2015-02-08 20:22:02 -0500 |
| commit | cd0ee35b3f887cc4ab6ba16cc2d955bfae607678 (patch) | |
| tree | bbe4ad9e924700d35833daf4f681a568dad278f5 /models/publickey.go | |
| parent | 3a44143b81aa050f53d5e0e2c87d4a84345cd94e (diff) | |
| parent | 1ab09e4f1b27789121dfba9a6c6e4aa0011ab215 (diff) | |
| download | gitea-cd0ee35b3f887cc4ab6ba16cc2d955bfae607678.tar.gz gitea-cd0ee35b3f887cc4ab6ba16cc2d955bfae607678.zip | |
Merge pull request #905 from phsmit/conf_on_cli
Add option to provide configuration file on command line
Diffstat (limited to 'models/publickey.go')
| -rw-r--r-- | models/publickey.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/publickey.go b/models/publickey.go index 67ab4242f2..893ff5c96a 100644 --- a/models/publickey.go +++ b/models/publickey.go @@ -29,7 +29,7 @@ import ( const ( // "### autogenerated by gitgos, DO NOT EDIT\n" - _TPL_PUBLICK_KEY = `command="%s serv key-%d",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n" + _TPL_PUBLICK_KEY = `command="%s serv --config=%s key-%d",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s` + "\n" ) var ( @@ -98,7 +98,7 @@ func (k *PublicKey) OmitEmail() string { // GetAuthorizedString generates and returns formatted public key string for authorized_keys file. func (key *PublicKey) GetAuthorizedString() string { - return fmt.Sprintf(_TPL_PUBLICK_KEY, appPath, key.Id, key.Content) + return fmt.Sprintf(_TPL_PUBLICK_KEY, appPath, setting.CustomConf, key.Id, key.Content) } var ( |