From 6492592b4acd52fc78d590690afa00a9bcada24e Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 7 Jun 2016 14:33:06 -0600 Subject: [PATCH] Update change list, fix build script; version 0.9 beta 1 --- caddy/caddymain/run.go | 3 +-- dist/CHANGES.txt | 15 +++++++++------ dist/README.txt | 2 +- dist/automate.go | 7 ++++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go index b1ae18592..2b1e01f96 100644 --- a/caddy/caddymain/run.go +++ b/caddy/caddymain/run.go @@ -29,8 +29,7 @@ func init() { setVersion() flag.BoolVar(&caddytls.Agreed, "agree", false, "Agree to the CA's Subscriber Agreement") - // TODO: Change from staging to v01 - flag.StringVar(&caddytls.DefaultCAUrl, "ca", "https://acme-staging.api.letsencrypt.org/directory", "URL to certificate authority's ACME server directory") + flag.StringVar(&caddytls.DefaultCAUrl, "ca", "https://acme-v01.api.letsencrypt.org/directory", "URL to certificate authority's ACME server directory") flag.StringVar(&conf, "conf", "", "Caddyfile to load (default \""+caddy.DefaultConfigFile+"\")") flag.StringVar(&cpu, "cpu", "100%", "CPU cap") flag.BoolVar(&plugins, "plugins", false, "List installed plugins") diff --git a/dist/CHANGES.txt b/dist/CHANGES.txt index 51531c52f..5c3371229 100644 --- a/dist/CHANGES.txt +++ b/dist/CHANGES.txt @@ -1,21 +1,24 @@ CHANGES -0.9 +0.9 beta 1 (June 7, 2016) - New core - New experimental QUIC support with -quic flag (HTTPS only) -- New -type flag to specify other server type -- Moved ~/.caddy/letsencrypt to ~/.caddy/acme and re-organized assets +- New -type flag to specify other server types +- Moved ~/.caddy/letsencrypt to ~/.caddy/acme and reorganized assets - Moved caddy package to top level folder, and pushed main to subfolder -- Changed -directives flag to -plugins - Site addresses can have paths - Site addresses can make some use of wildcards in domains -- Removed -restart option (all restarts happen in-process) +- Renamed -directives flag to -plugins +- Restarting no longer requires spawning a new process +- Removed -restart option +- log: New {request} placeholder to dump entire request (sans body) - markdown: Overhauled; removed site generation features - proxy: More control of headers - proxy: Specify multiple upstreams with optional port ranges -- tls: Support for ACME DNS challenge across 10 providers - tls: Generate self-signed certificates in memory +- tls: Support for ACME DNS challenge across 10 providers - tls: Support for TLS-SNI challenge during restarts +- Various bug fixes and enhancements 0.8.3 (April 26, 2016) diff --git a/dist/README.txt b/dist/README.txt index 19699f047..03e8b8d89 100644 --- a/dist/README.txt +++ b/dist/README.txt @@ -3,7 +3,7 @@ CADDY 0.9 beta 1 Website https://caddyserver.com -Community +Community Forum https://forum.caddyserver.com Twitter diff --git a/dist/automate.go b/dist/automate.go index 9b65475a1..af3dce16c 100644 --- a/dist/automate.go +++ b/dist/automate.go @@ -12,11 +12,12 @@ import ( "github.com/mholt/archiver" ) -var buildScript, repoDir, distDir, buildDir, releaseDir string +var buildScript, repoDir, mainDir, distDir, buildDir, releaseDir string func init() { repoDir = filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "mholt", "caddy") - buildScript = filepath.Join(repoDir, "caddy", "build.bash") + mainDir = filepath.Join(repoDir, "caddy") + buildScript = filepath.Join(mainDir, "build.bash") distDir = filepath.Join(repoDir, "dist") buildDir = filepath.Join(distDir, "builds") releaseDir = filepath.Join(distDir, "release") @@ -98,7 +99,7 @@ func main() { func build(p platform, out string) error { cmd := exec.Command(buildScript, out) - cmd.Dir = repoDir + cmd.Dir = mainDir cmd.Env = os.Environ() cmd.Env = append(cmd.Env, "CGO_ENABLED=0") cmd.Env = append(cmd.Env, "GOOS="+p.os)