Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-07-09 03:04:57 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modified repository path to be relative to root path.

Browse Source
This commit is contained in:
Abiola Ibrahim 2015-05-01 17:18:58 +01:00
parent 479c611420
commit 0d2ed0784f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
middleware/git/doc.go
View File

@ -13,8 +13,9 @@
// and https(e.g. https://github.com/user/project) are supported. // and https(e.g. https://github.com/user/project) are supported.
// Can be specified in either config block or top level // Can be specified in either config block or top level
// //
// path - directory to pull into // path - directory to pull into, relative to site root
// optional. Defaults to site root. // optional. Defaults to site root.
// If set, must be a subdirectory to site root to be valid.
// //
// branch - git branch or tag // branch - git branch or tag
// optional. Defaults to master // optional. Defaults to master
@ -30,10 +31,10 @@
// public repo pulled into site root // public repo pulled into site root
// git github.com/user/myproject // git github.com/user/myproject
// //
// public repo pulled into mysite // public repo pulled into <root>/mysite
// git https://github.com/user/myproject mysite // git https://github.com/user/myproject mysite
// //
// private repo pulled into mysite with tag v1.0 and interval of 1 day // private repo pulled into <root>/mysite with tag v1.0 and interval of 1 day
// git { // git {
// repo git@github.com:user/myproject // repo git@github.com:user/myproject
// branch v1.0 // branch v1.0

5
middleware/git/git.go
View File

@ -5,6 +5,7 @@ import (
"github.com/mholt/caddy/middleware" "github.com/mholt/caddy/middleware"
"net/http" "net/http"
"net/url" "net/url"
"path/filepath"
"runtime" "runtime"
"strconv" "strconv"
"strings" "strings"
@ -45,7 +46,7 @@ func parse(c middleware.Controller) (*Repo, error) {
switch len(args) { switch len(args) {
case 2: case 2:
repo.Path = args[1] repo.Path = filepath.Join(c.Root(), args[1])
fallthrough fallthrough
case 1: case 1:
repo.Url = args[0] repo.Url = args[0]
@ -62,7 +63,7 @@ func parse(c middleware.Controller) (*Repo, error) {
if !c.NextArg() { if !c.NextArg() {
return nil, c.ArgErr() return nil, c.ArgErr()
} }
repo.Path = c.Val() repo.Path = filepath.Join(c.Root(), c.Val())
case "branch": case "branch":
if !c.NextArg() { if !c.NextArg() {
return nil, c.ArgErr() return nil, c.ArgErr()