CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "cmd/ctrld: add "start --no-cd" flag to disable cd mode"

Browse Source 
This reverts commit 00fe7f59d13774f2ea6c325bdbb8165be58a1edd.

The purpose is disable cd mode for already installed service, which is
a hard problem than we thought. So leave it out of v1.2 cycle.
This commit is contained in:
Cuong Manh Le
2023-04-27 20:09:44 +07:00
committed by Cuong Manh Le
parent 5528ac8bf1
commit 31239684c7
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/ctrld/cli.go
View File

@@ -37,13 +37,7 @@ import (
"github.com/Control-D-Inc/ctrld/internal/router"
)
const (
selfCheckFQDN = "verify.controld.com"
cdModeConfigHeader = `# AUTO-GENERATED VIA CD FLAG - DO NOT MODIFY
# TO DISABLE AUTO-GENERATION RUN: ctrld service start --no-cd
`
)
const selfCheckFQDN = "verify.controld.com"
var (
version = "dev"
@@ -246,7 +240,6 @@ func initCLI() {
runCmd.Flags().StringVarP(&logPath, "log", "", "", "Path to log file")
runCmd.Flags().IntVarP(&cacheSize, "cache_size", "", 0, "Enable cache with size items")
runCmd.Flags().StringVarP(&cdUID, "cd", "", "", "Control D resolver uid")
runCmd.Flags().BoolVarP(&noCD, "no-cd", "", false, `Disable cd mode, the same effect with --cd=""`)
runCmd.Flags().StringVarP(&homedir, "homedir", "", "", "")
_ = runCmd.Flags().MarkHidden("homedir")
runCmd.Flags().StringVarP(&iface, "iface", "", "", `Update DNS setting for iface, "auto" means the default interface gateway`)
@@ -299,12 +292,6 @@ func initCLI() {
initLogging()
cfg.Service.LogPath = logPath
if noCD {
cdUID = ""
if err := writeConfigFile(); err != nil {
log.Fatalf("failed to overwrite config file with --no-cd: %v", err)
}
}
processCDFlags()
// Explicitly passing config, so on system where home directory could not be obtained,
@@ -362,7 +349,6 @@ func initCLI() {
startCmd.Flags().StringVarP(&logPath, "log", "", "", "Path to log file")
startCmd.Flags().IntVarP(&cacheSize, "cache_size", "", 0, "Enable cache with size items")
startCmd.Flags().StringVarP(&cdUID, "cd", "", "", "Control D resolver uid")
startCmd.Flags().BoolVarP(&noCD, "no-cd", "", false, `Disable cd mode, the same effect with --cd=""`)
startCmd.Flags().StringVarP(&iface, "iface", "", "", `Update DNS setting for iface, "auto" means the default interface gateway`)
startCmd.Flags().BoolVarP(&setupRouter, "router", "", false, `setup for running on router platforms`)
_ = startCmd.Flags().MarkHidden("router")
@@ -579,7 +565,7 @@ func writeConfigFile() error {
}
defer f.Close()
if cdUID != "" {
if _, err := f.WriteString(cdModeConfigHeader); err != nil {
if _, err := f.WriteString("# AUTO-GENERATED VIA CD FLAG - DO NOT MODIFY\n\n"); err != nil {
return err
}
}

1
cmd/ctrld/main.go
View File

@@ -27,7 +27,6 @@ var (
cfg ctrld.Config
verbose int
cdUID string
noCD bool
iface string
ifaceStartStop string
setupRouter bool