From 4d7801364615178ab4d29302a85eb44c981377e2 Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Tue, 10 Nov 2015 19:50:40 -0700
Subject: [PATCH] Clean up flags
---
main.go | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/main.go b/main.go
index 25065d6ad..aa9a2fbc7 100644
--- a/main.go
+++ b/main.go
@@ -30,23 +30,20 @@ const (
)
func init() {
+ flag.BoolVar(&letsencrypt.Agreed, "agree", false, "Agree to Let's Encrypt Subscriber Agreement")
+ flag.StringVar(&letsencrypt.CAUrl, "ca", "https://acme-staging.api.letsencrypt.org", "Certificate authority ACME server")
flag.StringVar(&conf, "conf", "", "Configuration file to use (default="+caddy.DefaultConfigFile+")")
flag.StringVar(&cpu, "cpu", "100%", "CPU cap")
+ flag.StringVar(&letsencrypt.DefaultEmail, "email", "", "Default Let's Encrypt account email address")
flag.StringVar(&caddy.Host, "host", caddy.DefaultHost, "Default host")
flag.BoolVar(&caddy.HTTP2, "http2", true, "HTTP/2 support") // TODO: temporary flag until http2 merged into std lib
+ flag.StringVar(&logfile, "log", "", "Process log file")
flag.StringVar(&pidfile, "pidfile", "", "Path to write pid file")
flag.StringVar(&caddy.Port, "port", caddy.DefaultPort, "Default port")
flag.BoolVar(&caddy.Quiet, "quiet", false, "Quiet mode (no initialization output)")
+ flag.StringVar(&revoke, "revoke", "", "Hostname for which to revoke the certificate")
flag.StringVar(&caddy.Root, "root", caddy.DefaultRoot, "Root path to default site")
flag.BoolVar(&version, "version", false, "Show version")
- // TODO: Boulder dev URL is: http://192.168.99.100:4000
- // TODO: Staging API URL is: https://acme-staging.api.letsencrypt.org
- // TODO: Production endpoint is: https://acme-v01.api.letsencrypt.org
- flag.BoolVar(&letsencrypt.Agreed, "agree", false, "Agree to Let's Encrypt Subscriber Agreement")
- flag.StringVar(&letsencrypt.CAUrl, "ca", "https://acme-staging.api.letsencrypt.org", "Certificate authority ACME server")
- flag.StringVar(&letsencrypt.DefaultEmail, "email", "", "Default Let's Encrypt account email address")
- flag.StringVar(&logfile, "log", "", "Process log file")
- flag.StringVar(&revoke, "revoke", "", "Hostname for which to revoke the certificate")
}
func main() {