diff --git a/config/config.go b/config/config.go index 68795b23..bfad2ad7 100644 --- a/config/config.go +++ b/config/config.go @@ -120,7 +120,6 @@ func Parse(c *caddy.Controller) ([]Config, error) { prefix := c.Val() prefix = strings.TrimPrefix(prefix, "/") prefix = strings.TrimSuffix(prefix, "/") - prefix = cfg.BaseURL + "/" + prefix cfg.WebDavURL = prefix case "show": if !c.NextArg() { @@ -246,7 +245,7 @@ func Parse(c *caddy.Controller) ([]Config, error) { caddyConf := httpserver.GetConfig(c) cfg.PrefixURL = strings.TrimSuffix(caddyConf.Addr.Path, "/") - cfg.WebDavURL = "/" + strings.TrimPrefix(cfg.WebDavURL, "/") + cfg.WebDavURL = cfg.BaseURL + "/" + strings.TrimPrefix(cfg.WebDavURL, "/") cfg.Handler = &webdav.Handler{ Prefix: cfg.WebDavURL, FileSystem: cfg.FileSystem, diff --git a/page/version.go b/page/version.go index 2c81d95c..4f8837ed 100644 --- a/page/version.go +++ b/page/version.go @@ -1,5 +1,5 @@ package page -var GIT_COMMIT_HASH = "e46a007" +var GIT_COMMIT_HASH = "056ea2b" var CIRCLE_BUILD_NUM = "" -var GENERATED int64 = 1492261242791293300 +var GENERATED int64 = 1492331591719476600