summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/caddyhttp/fileserver/command.go14
-rw-r--r--modules/caddyhttp/reverseproxy/command.go2
-rw-r--r--modules/caddypki/pki.go2
3 files changed, 11 insertions, 7 deletions
diff --git a/modules/caddyhttp/fileserver/command.go b/modules/caddyhttp/fileserver/command.go
index 18e9be3..943ddaa 100644
--- a/modules/caddyhttp/fileserver/command.go
+++ b/modules/caddyhttp/fileserver/command.go
@@ -40,10 +40,10 @@ demos, and development.
The listener's socket address can be customized with the --listen flag.
-If a qualifying hostname is specified with --domain, the default listener
-address will be changed to the HTTPS port and the server will use HTTPS
-if domain validation succeeds. Ensure A/AAAA records are properly
-configured before using this option.
+If a domain name is specified with --domain, the default listener address
+will be changed to the HTTPS port and the server will use HTTPS. If using
+a public domain, ensure A/AAAA records are properly configured before
+using this option.
If --browse is enabled, requests for folders without an index file will
respond with a file listing.`,
@@ -89,7 +89,11 @@ func cmdFileServer(fs caddycmd.Flags) (int, error) {
Routes: caddyhttp.RouteList{route},
}
if listen == "" {
- listen = ":" + strconv.Itoa(certmagic.HTTPSPort)
+ if domain == "" {
+ listen = ":80"
+ } else {
+ listen = ":" + strconv.Itoa(certmagic.HTTPSPort)
+ }
}
server.Listen = []string{listen}
diff --git a/modules/caddyhttp/reverseproxy/command.go b/modules/caddyhttp/reverseproxy/command.go
index 6110ca8..cde3084 100644
--- a/modules/caddyhttp/reverseproxy/command.go
+++ b/modules/caddyhttp/reverseproxy/command.go
@@ -51,7 +51,7 @@ default, all incoming headers are passed through unmodified.)
`,
Flags: func() *flag.FlagSet {
fs := flag.NewFlagSet("file-server", flag.ExitOnError)
- fs.String("from", "", "Address on which to receive traffic")
+ fs.String("from", "localhost:443", "Address on which to receive traffic")
fs.String("to", "", "Upstream address to which to to proxy traffic")
fs.Bool("change-host-header", false, "Set upstream Host header to address of upstream")
return fs
diff --git a/modules/caddypki/pki.go b/modules/caddypki/pki.go
index 1b10a8e..373b4cb 100644
--- a/modules/caddypki/pki.go
+++ b/modules/caddypki/pki.go
@@ -71,7 +71,7 @@ func (p *PKI) Start() error {
// install roots to trust store, if not disabled
for _, ca := range p.CAs {
if ca.InstallTrust != nil && !*ca.InstallTrust {
- ca.log.Warn("root certificate trust store installation disabled; clients will show warnings without intervention",
+ ca.log.Warn("root certificate trust store installation disabled; local clients may show warnings",
zap.String("path", ca.rootCertPath))
continue
}