mirror of
https://github.com/caddyserver/caddy.git
synced 2024-11-29 12:16:16 +08:00
Remove pre 0.9 code (#1304)
* Remove pre 0.9 code * Unused import * gofmtw
This commit is contained in:
parent
e641d2fd65
commit
d5fe4928f2
|
@ -7,7 +7,6 @@ import (
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -92,8 +91,6 @@ func Run() {
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
moveStorage() // TODO: This is temporary for the 0.9 release, or until most users upgrade to 0.9+
|
|
||||||
|
|
||||||
// Set CPU cap
|
// Set CPU cap
|
||||||
err := setCPU(cpu)
|
err := setCPU(cpu)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -166,51 +163,6 @@ func defaultLoader(serverType string) (caddy.Input, error) {
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// moveStorage moves the old certificate storage location by
|
|
||||||
// renaming the "letsencrypt" folder to the hostname of the
|
|
||||||
// CA URL. This is TEMPORARY until most users have upgraded to 0.9+.
|
|
||||||
func moveStorage() {
|
|
||||||
oldPath := filepath.Join(caddy.AssetsPath(), "letsencrypt")
|
|
||||||
_, err := os.Stat(oldPath)
|
|
||||||
if os.IsNotExist(err) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Just use a default config to get default (file) storage
|
|
||||||
fileStorage, err := new(caddytls.Config).StorageFor(caddytls.DefaultCAUrl)
|
|
||||||
if err != nil {
|
|
||||||
mustLogFatalf("[ERROR] Unable to get new path for certificate storage: %v", err)
|
|
||||||
}
|
|
||||||
newPath := fileStorage.(*caddytls.FileStorage).Path
|
|
||||||
err = os.MkdirAll(string(newPath), 0700)
|
|
||||||
if err != nil {
|
|
||||||
mustLogFatalf("[ERROR] Unable to make new certificate storage path: %v\n\nPlease follow instructions at:\nhttps://github.com/mholt/caddy/issues/902#issuecomment-228876011", err)
|
|
||||||
}
|
|
||||||
err = os.Rename(oldPath, string(newPath))
|
|
||||||
if err != nil {
|
|
||||||
mustLogFatalf("[ERROR] Unable to migrate certificate storage: %v\n\nPlease follow instructions at:\nhttps://github.com/mholt/caddy/issues/902#issuecomment-228876011", err)
|
|
||||||
}
|
|
||||||
// convert mixed case folder and file names to lowercase
|
|
||||||
var done bool // walking is recursive and preloads the file names, so we must restart walk after a change until no changes
|
|
||||||
for !done {
|
|
||||||
done = true
|
|
||||||
filepath.Walk(string(newPath), func(path string, info os.FileInfo, err error) error {
|
|
||||||
// must be careful to only lowercase the base of the path, not the whole thing!!
|
|
||||||
base := filepath.Base(path)
|
|
||||||
if lowerBase := strings.ToLower(base); base != lowerBase {
|
|
||||||
lowerPath := filepath.Join(filepath.Dir(path), lowerBase)
|
|
||||||
err = os.Rename(path, lowerPath)
|
|
||||||
if err != nil {
|
|
||||||
mustLogFatalf("[ERROR] Unable to lower-case: %v\n\nPlease follow instructions at:\nhttps://github.com/mholt/caddy/issues/902#issuecomment-228876011", err)
|
|
||||||
}
|
|
||||||
// terminate traversal and restart since Walk needs the updated file list with new file names
|
|
||||||
done = false
|
|
||||||
return errors.New("start over")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// setVersion figures out the version information
|
// setVersion figures out the version information
|
||||||
// based on variables set by -ldflags.
|
// based on variables set by -ldflags.
|
||||||
func setVersion() {
|
func setVersion() {
|
||||||
|
|
|
@ -16,8 +16,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
supportedPolicies = make(map[string]func() Policy)
|
supportedPolicies = make(map[string]func() Policy)
|
||||||
warnedProxyHeaderDeprecation bool // TODO: Temporary, until proxy_header is removed entirely
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type staticUpstream struct {
|
type staticUpstream struct {
|
||||||
|
@ -296,12 +295,6 @@ func parseBlock(c *caddyfile.Dispenser, u *staticUpstream) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
u.HealthCheck.Timeout = dur
|
u.HealthCheck.Timeout = dur
|
||||||
case "proxy_header": // TODO: deprecate this shortly after 0.9
|
|
||||||
if !warnedProxyHeaderDeprecation {
|
|
||||||
fmt.Println("WARNING: proxy_header is deprecated and will be removed soon; use header_upstream instead.")
|
|
||||||
warnedProxyHeaderDeprecation = true
|
|
||||||
}
|
|
||||||
fallthrough
|
|
||||||
case "header_upstream":
|
case "header_upstream":
|
||||||
var header, value string
|
var header, value string
|
||||||
if !c.Args(&header, &value) {
|
if !c.Args(&header, &value) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user