summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--bounce.c10
-rw-r--r--bounce.h8
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]))
9eval: Variable assignments on functions are no longer persistentHerbert Xu 2018-04-19parser: Fix parameter expansion inside inner double quotesHerbert Xu 2018-04-19parser: Fix parsing of ${}Herbert Xu 2018-04-19man: correct typos, iff -> ifMartijn Dekker 2018-04-19expand: Do not quote backslashes in unquoted parameter expansionHerbert Xu 2018-04-19shell: Add subdir-objects to AM_INIT_AUTOMAKEJason Bowen 2018-04-19eval: Restore input files in evalcommandHerbert Xu 2018-04-19eval: Reap zombies after built-in commands and functionsHerbert Xu 2018-04-19redir: Fix typo in noclobber codeHerbert Xu 2018-04-19expand: Fix glibc glob(3) supportHerbert Xu 2018-04-02expand: Fix buffer overflow in expandmetaHerbert Xu 2018-04-02builtin: Move echo space/nl handling into print_escape_strHerbert Xu 2018-04-02builtin: Fix echo performance regressionHerbert Xu 2018-04-02expand: Fix ghost fields with unquoted $@/$*Herbert Xu 2018-04-02parser: Allow newlines within parameter substitutionHerbert Xu 2018-04-02expand: Fix bugs with words connected to the right of $@Herbert Xu 2018-03-25Revert "[BUILTIN] Remove unnecessary restoration of format string in printf"Herbert Xu 2018-03-22parser: Fix backquote support in here-document EOF markHerbert Xu