summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/base/conf.go4
-rw-r--r--modules/middleware/repo.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go
index 1661681e7e..0fb1ccdcf6 100644
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -71,7 +71,7 @@ var Service struct {
ResetPwdCodeLives int
}
-func exeDir() (string, error) {
+func ExecDir() (string, error) {
file, err := exec.LookPath(os.Args[0])
if err != nil {
return "", err
@@ -244,7 +244,7 @@ func newNotifyMailService() {
func NewConfigContext() {
//var err error
- workDir, err := exeDir()
+ workDir, err := ExecDir()
if err != nil {
fmt.Printf("Fail to get work directory: %s\n", err)
os.Exit(2)
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index eea2570ca6..b23bccb104 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -73,7 +73,7 @@ func RepoAssignment(redirect bool) martini.Handler {
if base.EnableHttpsClone {
scheme = "https"
}
- ctx.Repo.CloneLink.SSH = fmt.Sprintf("git@%s:%s/%s.git", base.Domain, user.LowerName, repo.LowerName)
+ ctx.Repo.CloneLink.SSH = fmt.Sprintf("%s@%s:%s/%s.git", base.RunUser, base.Domain, user.LowerName, repo.LowerName)
ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s://%s/%s/%s.git", scheme, base.Domain, user.LowerName, repo.LowerName)
ctx.Data["IsRepositoryValid"] = true