From f3b13a3f1fde68181db1952781962d01ebda40cd Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Wed, 6 Nov 2019 16:13:08 -0500
Subject: Define one CERTBOT_PATH rather than two format strings

---
 bounce.c | 10 ++++++++--
 bounce.h |  8 ++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bounce.c b/bounce.c
index a381db3..93afbb4 100644
--- a/bounce.c
+++ b/bounce.c
@@ -303,10 +303,16 @@ int main(int argc, char *argv[]) {
 		}
 	}
 	if (!certPath[0]) {
-		snprintf(certPath, sizeof(certPath), DEFAULT_CERT_PATH, bindHost);
+		snprintf(
+			certPath, sizeof(certPath), CERTBOT_PATH "/live/%s/fullchain.pem",
+			bindHost
+		);
 	}
 	if (!privPath[0]) {
-		snprintf(privPath, sizeof(privPath), DEFAULT_PRIV_PATH, bindHost);
+		snprintf(
+			privPath, sizeof(privPath), CERTBOT_PATH "/live/%s/privkey.pem",
+			bindHost
+		);
 	}
 
 	if (!host) errx(EX_USAGE, "host required");
diff --git a/bounce.h b/bounce.h
index a46c7e4..37cfc7c 100644
--- a/bounce.h
+++ b/bounce.h
@@ -23,12 +23,8 @@
 
 #include "compat.h"
 
-#ifndef DEFAULT_CERT_PATH
-#define DEFAULT_CERT_PATH "/usr/local/etc/letsencrypt/live/%s/fullchain.pem"
-#endif
-
-#ifndef DEFAULT_PRIV_PATH
-#define DEFAULT_PRIV_PATH "/usr/local/etc/letsencrypt/live/%s/privkey.pem"
+#ifndef CERTBOT_PATH
+#define CERTBOT_PATH "/usr/local/etc/letsencrypt"
 #endif
 
 #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
-- 
cgit 1.4.1