diff options
| author | Peter Smit <peter@smitmail.eu> | 2015-02-05 12:12:37 +0200 |
|---|---|---|
| committer | Peter Smit <peter@smitmail.eu> | 2015-02-05 12:17:35 +0200 |
| commit | 1ab09e4f1b27789121dfba9a6c6e4aa0011ab215 (patch) | |
| tree | 59ec5e54ed44c41915217522ea37bebf24bd5797 /models | |
| parent | 02c5bade0fabc24b9b7c05a74c65965e2e53f687 (diff) | |
| download | gitea-1ab09e4f1b27789121dfba9a6c6e4aa0011ab215.tar.gz gitea-1ab09e4f1b27789121dfba9a6c6e4aa0011ab215.zip | |
Add option to provide configuration file on command line
Diffstat (limited to 'models')
| -rw-r--r-- | models/publickey.go | 4 | ||||
| -rw-r--r-- | models/repo.go | 4 |
2 files changed, 4 insertions, 4 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 ( diff --git a/models/repo.go b/models/repo.go index b745821753..edd156133b 100644 --- a/models/repo.go +++ b/models/repo.go @@ -30,7 +30,7 @@ import ( ) const ( - TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3\n" + TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update --config=%s $1 $2 $3\n" ) var ( @@ -424,7 +424,7 @@ func initRepository(f string, u *User, repo *Repository, initReadme bool, repoLa // hook/post-update if err := createHookUpdate(filepath.Join(repoPath, "hooks", "update"), - fmt.Sprintf(TPL_UPDATE_HOOK, setting.ScriptType, "\""+appPath+"\"")); err != nil { + fmt.Sprintf(TPL_UPDATE_HOOK, setting.ScriptType, "\""+appPath+"\"", setting.CustomConf)); err != nil { return err } |