You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
90 lines
3.4 KiB
90 lines
3.4 KiB
Index: src/github.com/hlandau/acmetool/cli/main.go |
|
--- src/github.com/hlandau/acmetool/cli/main.go.orig 2019-12-20 22:11:58.000000000 +0100 |
|
+++ src/github.com/hlandau/acmetool/cli/main.go 2019-12-28 12:41:47.051688000 +0100 |
|
@@ -47,7 +47,7 @@ |
|
|
|
stdioFlag = kingpin.Flag("stdio", "Don't attempt to use console dialogs; fall back to stdio prompts").Bool() |
|
|
|
- responseFileFlag = kingpin.Flag("response-file", "Read dialog responses from the given file (default: $ACME_STATE_DIR/conf/responses)").ExistingFile() |
|
+ responseFileFlag = kingpin.Flag("response-file", "Read dialog responses from the given file").Default("@l_prefix@/etc/acmetool/responses.yaml").ExistingFile() |
|
|
|
reconcileCmd = kingpin.Command("reconcile", reconcileHelp).Default() |
|
reconcileSpecArg = reconcileCmd.Arg("target-filenames", "optionally, specify one or more target file paths or filenames to reconcile only those targets").Strings() |
|
@@ -139,13 +139,6 @@ |
|
interaction.NoDialog = true |
|
} |
|
|
|
- if *responseFileFlag == "" { |
|
- p := filepath.Join(*stateFlag, "conf/responses") |
|
- if _, err := os.Stat(p); err == nil { |
|
- *responseFileFlag = p |
|
- } |
|
- } |
|
- |
|
if *responseFileFlag != "" { |
|
err := loadResponseFile(*responseFileFlag) |
|
log.Errore(err, "cannot load response file, continuing anyway") |
|
Index: src/github.com/hlandau/acmetool/cli/quickstart-linux.go |
|
--- src/github.com/hlandau/acmetool/cli/quickstart-linux.go.orig 2019-12-20 22:11:58.000000000 +0100 |
|
+++ src/github.com/hlandau/acmetool/cli/quickstart-linux.go 2019-12-28 12:41:47.051816000 +0100 |
|
@@ -1,4 +1,4 @@ |
|
-// +build linux |
|
+// +build foo |
|
|
|
package cli |
|
|
|
Index: src/github.com/hlandau/acmetool/cli/quickstart-nlinux.go |
|
--- src/github.com/hlandau/acmetool/cli/quickstart-nlinux.go.orig 2019-12-20 22:11:58.000000000 +0100 |
|
+++ src/github.com/hlandau/acmetool/cli/quickstart-nlinux.go 2019-12-28 12:42:38.429532000 +0100 |
|
@@ -1,4 +1,4 @@ |
|
-// +build !linux |
|
+// +build !foo |
|
|
|
package cli |
|
|
|
Index: src/github.com/hlandau/acmetool/cli/quickstart.go |
|
--- src/github.com/hlandau/acmetool/cli/quickstart.go.orig 2019-12-20 22:11:58.000000000 +0100 |
|
+++ src/github.com/hlandau/acmetool/cli/quickstart.go 2019-12-28 12:41:47.051988000 +0100 |
|
@@ -84,12 +84,6 @@ |
|
promptSystemd() |
|
} |
|
|
|
- installDefaultHooks() |
|
- if promptInstallCombinedHooks() { |
|
- installCombinedHooks() |
|
- } |
|
- |
|
- promptCron() |
|
promptGettingStarted() |
|
} |
|
|
|
Index: src/github.com/hlandau/acmetool/hooks/hooks.go |
|
--- src/github.com/hlandau/acmetool/hooks/hooks.go.orig 2019-12-20 22:11:58.000000000 +0100 |
|
+++ src/github.com/hlandau/acmetool/hooks/hooks.go 2019-12-28 12:41:47.052123000 +0100 |
|
@@ -49,7 +49,7 @@ |
|
return |
|
} |
|
|
|
- DefaultPaths = []string{"/usr/libexec/acme/hooks", "/usr/lib/acme/hooks"} |
|
+ DefaultPaths = []string{} |
|
|
|
// Put the preferred directory first. |
|
prefDir, err := preferredHookDir(DefaultPaths) |
|
Index: src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go |
|
--- src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go.orig 2019-12-20 22:12:12.000000000 +0100 |
|
+++ src/gopkg.in/hlandau/svcutils.v1/caps/caps-linuxc.go 2019-12-28 12:41:47.052246000 +0100 |
|
@@ -1,4 +1,4 @@ |
|
-// +build linux,cgo |
|
+// +build foo |
|
|
|
package caps |
|
|
|
Index: src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go |
|
--- src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go.orig 2019-12-20 22:12:12.000000000 +0100 |
|
+++ src/gopkg.in/hlandau/svcutils.v1/caps/caps-other.go 2019-12-28 12:41:47.052344000 +0100 |
|
@@ -1,4 +1,4 @@ |
|
-// +build !linux linux,!cgo |
|
+// +build !foo |
|
|
|
package caps |
|
|
|
|