github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-05-30 15:49:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v2: Implement 'pki' app powered by Smallstep for localhost certificates (#3125)

Browse Source 
* pki: Initial commit of PKI app (WIP) (see #2502 and #3021)

* pki: Ability to use root/intermediates, and sign with root

* pki: Fix benign misnamings left over from copy+paste

* pki: Only install root if not already trusted

* Make HTTPS port the default; all names use auto-HTTPS; bug fixes

* Fix build - what happened to our CI tests??

* Fix go.mod
This commit is contained in:
Matt Holt
2020-03-13 11:06:08 -06:00
committed by GitHub
parent cfe85a9fe6
commit 5a19db5dc2
21 changed files with 1293 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/caddyhttp/fileserver/command.go
View File

@ -23,7 +23,6 @@ import (
"github.com/caddyserver/caddy/v2"
"github.com/caddyserver/caddy/v2/caddyconfig"
"github.com/caddyserver/caddy/v2/caddyconfig/httpcaddyfile"
caddycmd "github.com/caddyserver/caddy/v2/cmd"
"github.com/caddyserver/caddy/v2/modules/caddyhttp"
"github.com/caddyserver/certmagic"
@ -90,11 +89,7 @@ func cmdFileServer(fs caddycmd.Flags) (int, error) {
Routes: caddyhttp.RouteList{route},
}
if listen == "" {
if certmagic.HostQualifies(domain) {
listen = ":" + strconv.Itoa(certmagic.HTTPSPort)
} else {
listen = ":" + httpcaddyfile.DefaultPort
}
listen = ":" + strconv.Itoa(certmagic.HTTPSPort)
}
server.Listen = []string{listen}