From d7cbd9355ee31ad99db6220f5fcae17accfdb48c Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Sun, 23 Apr 2017 15:20:08 +0100
Subject: [PATCH] remove caddydev from travis

---
 .travis.yml |  1 -
 setup.go    | 20 +++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b602ddda..2c51d262 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ go:
 install:
   - go get $(go list -f '{{join .Imports "\n"}}' ./... | sort | uniq | grep -v caddy-hugo) || true
   - go get github.com/mholt/caddy/caddyhttp
-  - go get github.com/caddyserver/caddydev
 
 script:
   - sed -i 's/\_ \"github.com\/mholt\/caddy\/caddyhttp\"/\_ \"github.com\/mholt\/caddy\/caddyhttp\"\n\_ \"github.com\/hacdias\/caddy-hugo\"/g' $GOPATH/src/github.com/mholt/caddy/caddy/caddymain/run.go
diff --git a/setup.go b/setup.go
index a51a5e27..bda22860 100644
--- a/setup.go
+++ b/setup.go
@@ -72,6 +72,7 @@ type Config struct {
 	BaseURL       string   // BaseURL of admin interface
 	WebDavURL     string
 	CleanPublic   bool
+	AllowPublish  bool
 	BeforePublish config.CommandFunc
 	AfterPublish  config.CommandFunc
 }
@@ -118,7 +119,7 @@ func parse(c *caddy.Controller, root string) (*Config, *filemanager.FileManager,
 			switch c.Val() {
 			case "flag":
 				if !c.NextArg() {
-					return cfg, &filemanager.FileManager{}, c.ArgErr()
+					return nil, nil, c.ArgErr()
 				}
 
 				flag := c.Val()
@@ -129,15 +130,24 @@ func parse(c *caddy.Controller, root string) (*Config, *filemanager.FileManager,
 				}
 
 				cfg.Args = append(cfg.Args, "--"+flag+"="+value)
+			case "allow_publish":
+				if !c.NextArg() {
+					return nil, nil, c.ArgErr()
+				}
+
+				cfg.AllowPublish, err = strconv.ParseBool(c.Val())
+				if err != nil {
+					return nil, nil, c.ArgErr()
+				}
 			case "clean_public":
 				if !c.NextArg() {
-					return cfg, &filemanager.FileManager{}, c.ArgErr()
+					return nil, nil, c.ArgErr()
 				}
 
 				cfg.CleanPublic, err = strconv.ParseBool(c.Val())
 
 				if err != nil {
-					return cfg, &filemanager.FileManager{}, c.ArgErr()
+					return nil, nil, c.ArgErr()
 				}
 			case "before_publish":
 				if cfg.BeforePublish, err = config.CommandRunner(c); err != nil {
@@ -165,7 +175,7 @@ func parse(c *caddy.Controller, root string) (*Config, *filemanager.FileManager,
 	fmConfig, err := config.Parse(caddy.NewTestController("http", tokens))
 
 	if err != nil {
-		return cfg, fm, err
+		return nil, nil, err
 	}
 
 	fm = &filemanager.FileManager{Configs: fmConfig}
@@ -173,7 +183,7 @@ func parse(c *caddy.Controller, root string) (*Config, *filemanager.FileManager,
 	cfg.WebDavURL = fm.Configs[0].WebDavURL
 
 	if err != nil {
-		return cfg, fm, err
+		return nil, nil, err
 	}
 
 	return cfg, fm, nil