github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-13 09:43:52 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Refactor code related to getting current version

Browse Source 
And set version in CertMagic for User-Agent purposes
This commit is contained in:
Matthew Holt
2019-06-28 19:28:28 -06:00
parent a4bdf249db
commit 31ab737bf2
5 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/commands.go
View File

@ -10,8 +10,10 @@ import (
"os"
"os/exec"
"path/filepath"
"strings"
"github.com/caddyserver/caddy"
"github.com/mholt/certmagic"
"github.com/mitchellh/go-ps"
)
@ -126,6 +128,11 @@ func cmdRun() (int, error) {
}
}
// set a fitting User-Agent for ACME requests
goModule := caddy.GoModule()
cleanModVersion := strings.TrimPrefix(goModule.Version, "v")
certmagic.UserAgent = "Caddy/" + cleanModVersion
// start the admin endpoint along with any initial config
err := caddy.StartAdmin(config)
if err != nil {
@ -180,10 +187,10 @@ func cmdStop() (int, error) {
}
func cmdVersion() (int, error) {
goModule := getGoBuildModule()
goModule := caddy.GoModule()
if goModule.Sum != "" {
// a build with a known version will also have a checksum
fmt.Printf("%s (%s)\n", goModule.Version, goModule.Sum)
fmt.Printf("%s %s\n", goModule.Version, goModule.Sum)
} else {
fmt.Println(goModule.Version)
}