From c9a45b5818715197641726689e5b7078b684ebe6 Mon Sep 17 00:00:00 2001
From: Andrew Meyer <andrewm.bpi@gmail.com>
Date: Sun, 6 May 2018 22:15:36 -0500
Subject: [PATCH 1/2] Remove trailing whitespace from README and config
---
README.md | 20 ++++++++++----------
config.cfg | 8 ++++----
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/README.md b/README.md
index b91a533a..c5a767c2 100644
--- a/README.md
+++ b/README.md
@@ -121,11 +121,11 @@ Check out how in the INSTALL section.
### Using Docker
-1) Pull the latest acme-dns Docker image: `docker pull joohoi/acme-dns`
+1) Pull the latest acme-dns Docker image: `docker pull joohoi/acme-dns`
2) Create directories: `config` for the configuration file, and `data` for the sqlite3 database.
-3) Copy [configuration template](https://raw.githubusercontent.com/joohoi/acme-dns/master/config.cfg) to `config/config.cfg`
+3) Copy [configuration template](https://raw.githubusercontent.com/joohoi/acme-dns/master/config.cfg) to `config/config.cfg`
4) Modify the config.cfg to suit your needs.
@@ -143,7 +143,7 @@ docker run --rm --name acmedns \
1) Create directories: `config` for the configuration file, and `data` for the sqlite3 database.
-2) Copy [configuration template](https://raw.githubusercontent.com/joohoi/acme-dns/master/config.cfg) to `config/config.cfg`
+2) Copy [configuration template](https://raw.githubusercontent.com/joohoi/acme-dns/master/config.cfg) to `config/config.cfg`
3) Copy [docker-compose.yml from the project](https://raw.githubusercontent.com/joohoi/acme-dns/master/docker-compose.yml), or create your own.
@@ -187,7 +187,7 @@ $ curl -X POST \
Note: The `txt` field must be exactly 43 characters long, otherwise acme-dns will reject it
-4) Perform a DNS lookup to the test subdomain to confirm that everything is working properly:
+4) Perform a DNS lookup to the test subdomain to confirm that everything is working properly:
```
$ dig @ns.auth.example.com d420c923-bbd7-4056-ab64-c3ca54c9b3cf.auth.example.com
```
@@ -200,9 +200,9 @@ $ dig @ns.auth.example.com d420c923-bbd7-4056-ab64-c3ca54c9b3cf.auth.example.com
listen = ":53"
# protocol, "udp", "udp4", "udp6" or "tcp", "tcp4", "tcp6"
protocol = "udp"
-# domain name to serve the requests off of
+# domain name to serve the requests off of
domain = "auth.example.org"
-# zone name server
+# zone name server
nsname = "ns1.auth.example.org"
# admin email address, where @ is substituted with .
nsadmin = "admin.example.org"
@@ -210,7 +210,7 @@ nsadmin = "admin.example.org"
records = [
# default A
"auth.example.org. A 192.168.1.100",
- # A
+ # A
"ns1.auth.example.org. A 192.168.1.100",
"ns2.auth.example.org. A 192.168.1.100",
# NS
@@ -255,7 +255,7 @@ loglevel = "debug"
logtype = "stdout"
# file path for logfile TODO
# logfile = "./acme-dns.log"
-# format, either "json" or "text"
+# format, either "json" or "text"
logformat = "text"
# use HTTP header to get the client ip
use_header = false
@@ -272,7 +272,7 @@ header_name = "X-Forwarded-For"
### Authentication hooks
- Certbot authentication hook in Python: [https://github.com/joohoi/acme-dns-certbot-joohoi](https://github.com/joohoi/acme-dns-certbot-joohoi)
-- Certbot authentication hook in Go: [https://github.com/koesie10/acme-dns-certbot-hook](https://github.com/koesie10/acme-dns-certbot-hook)
+- Certbot authentication hook in Go: [https://github.com/koesie10/acme-dns-certbot-hook](https://github.com/koesie10/acme-dns-certbot-hook)
### Libraries
@@ -295,7 +295,7 @@ header_name = "X-Forwarded-For"
## Contributing
-acme-dns is open for contributions.
+acme-dns is open for contributions.
If you have an idea for improvement, please open an new issue or feel free to write a PR!
## License
diff --git a/config.cfg b/config.cfg
index 2798ad53..ca4ec3ad 100644
--- a/config.cfg
+++ b/config.cfg
@@ -3,9 +3,9 @@
listen = ":53"
# protocol, "udp", "udp4", "udp6" or "tcp", "tcp4", "tcp6"
protocol = "udp"
-# domain name to serve the requests off of
+# domain name to serve the requests off of
domain = "auth.example.org"
-# zone name server
+# zone name server
nsname = "ns1.auth.example.org"
# admin email address, where @ is substituted with .
nsadmin = "admin.example.org"
@@ -13,7 +13,7 @@ nsadmin = "admin.example.org"
records = [
# default A
"auth.example.org. A 192.168.1.100",
- # A
+ # A
"ns1.auth.example.org. A 192.168.1.100",
"ns2.auth.example.org. A 192.168.1.100",
# NS
@@ -63,5 +63,5 @@ loglevel = "debug"
logtype = "stdout"
# file path for logfile TODO
# logfile = "./acme-dns.log"
-# format, either "json" or "text"
+# format, either "json" or "text"
logformat = "text"
From 4770a5967739374067ce1aa0c9ec03c661f5fca3 Mon Sep 17 00:00:00 2001
From: Andrew Meyer <andrewm.bpi@gmail.com>
Date: Sun, 6 May 2018 22:17:42 -0500
Subject: [PATCH 2/2] Make ACME cache directory location configurable
---
README.md | 2 ++
config.cfg | 2 ++
main.go | 2 +-
types.go | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c5a767c2..fbbee876 100644
--- a/README.md
+++ b/README.md
@@ -243,6 +243,8 @@ tls = "none"
# only used if tls = "cert"
tls_cert_privkey = "/etc/tls/example.org/privkey.pem"
tls_cert_fullchain = "/etc/tls/example.org/fullchain.pem"
+# only used if tls = "letsencrypt"
+acme_cache_dir = "api-certs"
# CORS AllowOrigins, wildcards can be used
corsorigins = [
"*"
diff --git a/config.cfg b/config.cfg
index ca4ec3ad..93dd663d 100644
--- a/config.cfg
+++ b/config.cfg
@@ -47,6 +47,8 @@ tls = "none"
# only used if tls = "cert"
tls_cert_privkey = "/etc/tls/example.org/privkey.pem"
tls_cert_fullchain = "/etc/tls/example.org/fullchain.pem"
+# only used if tls = "letsencrypt"
+acme_cache_dir = "api-certs"
# CORS AllowOrigins, wildcards can be used
corsorigins = [
"*"
diff --git a/main.go b/main.go
index adee8385..dbea6828 100644
--- a/main.go
+++ b/main.go
@@ -81,7 +81,7 @@ func startHTTPAPI() {
switch Config.API.TLS {
case "letsencrypt":
m := autocert.Manager{
- Cache: autocert.DirCache("api-certs"),
+ Cache: autocert.DirCache(Config.API.ACMECacheDir),
Prompt: autocert.AcceptTOS,
HostPolicy: autocert.HostWhitelist(Config.API.Domain),
}
diff --git a/types.go b/types.go
index fe21581f..c2a6e3b7 100644
--- a/types.go
+++ b/types.go
@@ -58,6 +58,7 @@ type httpapi struct {
TLS string
TLSCertPrivkey string `toml:"tls_cert_privkey"`
TLSCertFullchain string `toml:"tls_cert_fullchain"`
+ ACMECacheDir string `toml:"acme_cache_dir"`
CorsOrigins []string
UseHeader bool `toml:"use_header"`
HeaderName string `toml:"header_name"`