Merge joohoi#283 to our fork

Co-authored-by: Matthias Schneider <ms@wck.biz>
Signed-off-by: İlteriş Yağıztegin Eroğlu <me@linuxgemini.space>

README.md

@@ -267,8 +267,10 @@ ip = "0.0.0.0"
 disable_registration = false
 # listen port, eg. 443 for default HTTPS
 port = "443"
-# possible values: "letsencrypt", "letsencryptstaging", "cert", "none"
+# possible values: "letsencrypt", "letsencryptstaging", "cert", "custom", "none"
 tls = "letsencryptstaging"
+# only used if tls = "custom"
+tls_custom_url = "https://acme-v02.example.com/directory"
 # only used if tls = "cert"
 tls_cert_privkey = "/etc/tls/example.org/privkey.pem"
 tls_cert_fullchain = "/etc/tls/example.org/fullchain.pem"

config.cfg

@@ -36,8 +36,10 @@ ip = "0.0.0.0"
 disable_registration = false
 # listen port, eg. 443 for default HTTPS
 port = "443"
-# possible values: "letsencrypt", "letsencryptstaging", "cert", "none"
+# possible values: "letsencrypt", "letsencryptstaging", "cert", "custom", "none"
 tls = "letsencryptstaging"
+# only used if tls = "custom"
+tls_custom_url = "https://acme-v02.example.com/directory"
 # only used if tls = "cert"
 tls_cert_privkey = "/etc/tls/example.org/privkey.pem"
 tls_cert_fullchain = "/etc/tls/example.org/fullchain.pem"

main.go

@@ -141,9 +141,12 @@ func startHTTPAPI(errChan chan error, config DNSConfig, dnsservers []*DNSServer)
 	// Set up certmagic for getting certificate for acme-dns api
 	certmagic.DefaultACME.DNS01Solver = &provider
 	certmagic.DefaultACME.Agreed = true
-	if Config.API.TLS == "letsencrypt" {
+	switch Config.API.TLS {
+	case "letsencrypt":
 		certmagic.DefaultACME.CA = certmagic.LetsEncryptProductionCA
-	} else {
+	case: "custom":
+		certmagic.DefaultACME.CA = Config.API.TLSCustomURL
+	default:
 		certmagic.DefaultACME.CA = certmagic.LetsEncryptStagingCA
 	}
 	certmagic.DefaultACME.Email = Config.API.NotificationEmail
@@ -160,29 +163,14 @@ func startHTTPAPI(errChan chan error, config DNSConfig, dnsservers []*DNSServer)
 	magic := certmagic.New(magicCache, *magicConf)
 	var err error
 	switch Config.API.TLS {
-	case "letsencryptstaging":
+	case "letsencrypt", "letsencryptstaging", "custom":
 		err = magic.ManageAsync(context.Background(), []string{Config.General.Domain})
 		if err != nil {
 			errChan <- err
 			return
 		}
 		cfg.GetCertificate = magic.GetCertificate
 
-		srv := &http.Server{
-			Addr:      host,
-			Handler:   c.Handler(api),
-			TLSConfig: cfg,
-			ErrorLog:  stdlog.New(logwriter, "", 0),
-		}
-		log.WithFields(log.Fields{"host": host, "domain": Config.General.Domain}).Info("Listening HTTPS")
-		err = srv.ListenAndServeTLS("", "")
-	case "letsencrypt":
-		err = magic.ManageAsync(context.Background(), []string{Config.General.Domain})
-		if err != nil {
-			errChan <- err
-			return
-		}
-		cfg.GetCertificate = magic.GetCertificate
 		srv := &http.Server{
 			Addr:      host,
 			Handler:   c.Handler(api),

types.go

@@ -45,6 +45,7 @@ type httpapi struct {
 	AutocertPort        string `toml:"autocert_port"`
 	Port                string `toml:"port"`
 	TLS                 string
+	TLSCustomURL        string `toml:"tls_custom_url"`
 	TLSCertPrivkey      string `toml:"tls_cert_privkey"`
 	TLSCertFullchain    string `toml:"tls_cert_fullchain"`
 	ACMECacheDir        string `toml:"acme_cache_dir"`