summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-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]))
il of LightningJune McEnroe 2019-09-22Revert "Enable cookies in title"June McEnroe This reverts commit 279111dda15dd9170e11b9688eb973f2af2e6300. 2019-09-20Enable cookies in titleJune McEnroe Perhaps this will make it less suspicious to Google. Who knows. 2019-09-16Use sensitivity aliases in TF2June McEnroe 2019-09-16Add The Just CityJune McEnroe 2019-09-12Only GET the final redirect locationJune McEnroe 2019-09-12Consume entire bodyJune McEnroe Aborting the request and leaving data around may be causing intermittent errors. Just discard the rest of the data. 2019-09-10Add title -v flagJune McEnroe 2019-09-10Use curl error bufferJune McEnroe 2019-09-10Set Accept-Encoding in titleJune McEnroe Because apparently it's fine for servers to respond with Content-Encoding you didn't ask for, and curl won't decode it if you didn't ask for it. 2019-09-08Set title User-AgentJune McEnroe Some things don't like you if you don't send one. 2019-09-07Add -x flag to titleJune McEnroe 2019-09-07Ignore SIGPIPE in relayJune McEnroe Allows restarting consumers safely. 2019-09-07Add A Memory Called EmpireJune McEnroe 2019-09-05Handle lack of Content-TypeJune McEnroe 2019-09-05Use CURLINFO_CONTENT_TYPEJune McEnroe Oops, didn't see this. 2019-09-05Decode entities in titlesJune McEnroe 2019-09-05Print title as soon as it's availableJune McEnroe 2019-09-05Use CURL_PREFIX to set flagsJune McEnroe 2019-09-05Add titleJune McEnroe 2019-09-04Add Avorter n'est pas tuerJune McEnroe 2019-08-29Unset executable on shell scriptsJune McEnroe 2019-08-29Add long-missing setopt to bin.7June McEnroe 2019-08-29Add editJune McEnroe