mirror of
https://github.com/kopia/kopia.git
synced 2026-10-25 15:48:47 -04:00
cli: 'kopia server' made --ui default (#452)
This commit is contained in:
1 parent
130712a1b4
commit
9123e3ebff
2 files changed
+13
-2
No files matched your search
@@ -29,7 +29,7 @@ import (
|
||||
var (
|
||||
serverStartCommand = serverCommands.Command("start", "Start Kopia server").Default()
|
||||
serverStartHTMLPath = serverStartCommand.Flag("html", "Server the provided HTML at the root URL").ExistingDir()
|
||||
serverStartUI = serverStartCommand.Flag("ui", "Start the server with HTML UI (EXPERIMENTAL)").Bool()
|
||||
serverStartUI = serverStartCommand.Flag("ui", "Start the server with HTML UI").Default("true").Bool()
|
||||
serverStartRefreshInterval = serverStartCommand.Flag("refresh-interval", "Frequency for refreshing repository status").Default("10s").Duration()
|
||||
|
||||
serverStartRandomPassword = serverStartCommand.Flag("random-password", "Generate random password and print to stderr").Hidden().Bool()
|
||||
@@ -138,7 +138,7 @@ func stripProtocol(addr string) string {
|
||||
}
|
||||
|
||||
func isKnownUIRoute(path string) bool {
|
||||
return strings.HasPrefix(path, "/snapshots/") ||
|
||||
return strings.HasPrefix(path, "/snapshots") ||
|
||||
strings.HasPrefix(path, "/policies") ||
|
||||
strings.HasPrefix(path, "/repo")
|
||||
}
|
||||
|
||||
@@ -161,6 +161,8 @@ func startServerWithOptionalTLSAndListener(ctx context.Context, httpServer *http
|
||||
case *serverStartTLSCertFile != "" && *serverStartTLSKeyFile != "":
|
||||
// PEM files provided
|
||||
fmt.Fprintf(os.Stderr, "SERVER ADDRESS: https://%v\n", httpServer.Addr)
|
||||
showServerUIPrompt()
|
||||
|
||||
return httpServer.ServeTLS(listener, *serverStartTLSCertFile, *serverStartTLSKeyFile)
|
||||
|
||||
case *serverStartTLSGenerateCert:
|
||||
@@ -182,11 +184,20 @@ func startServerWithOptionalTLSAndListener(ctx context.Context, httpServer *http
|
||||
fingerprint := sha256.Sum256(cert.Raw)
|
||||
fmt.Fprintf(os.Stderr, "SERVER CERT SHA256: %v\n", hex.EncodeToString(fingerprint[:]))
|
||||
fmt.Fprintf(os.Stderr, "SERVER ADDRESS: https://%v\n", httpServer.Addr)
|
||||
showServerUIPrompt()
|
||||
|
||||
return httpServer.ServeTLS(listener, "", "")
|
||||
|
||||
default:
|
||||
fmt.Fprintf(os.Stderr, "SERVER ADDRESS: http://%v\n", httpServer.Addr)
|
||||
showServerUIPrompt()
|
||||
|
||||
return httpServer.Serve(listener)
|
||||
}
|
||||
}
|
||||
|
||||
func showServerUIPrompt() {
|
||||
if *serverStartUI {
|
||||
printStderr("\nOpen the address above in a web browser to use the UI.\n")
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user