From 9ac5f5d408e11fbd039eba2aa085f0ee71394e88 Mon Sep 17 00:00:00 2001
From: Mark Tearle <mtearle@ucc.asn.au>
Date: Mon, 8 Feb 2021 21:30:28 +0800
Subject: [PATCH] Fix API paths

---
 quovadis/quovadis.php            | 14 +++++++-------
 scripts/certbot-hook-quovadis.sh |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/quovadis/quovadis.php b/quovadis/quovadis.php
index 048672d..0c4a0a5 100644
--- a/quovadis/quovadis.php
+++ b/quovadis/quovadis.php
@@ -156,13 +156,13 @@ Quovadis
 
 UCC DNS Helper
 
-Your API key is: $api_key;
+Your API key is: $api_key
 
 Rough API usage is:
 
-curl -X POST -d username=accmurphy https://quovadis.ucc.asn.au/register
-curl -X POST -d username=accmurphy -d api_key=foo -d new_api_key=bar https://quovadis.ucc.asn.au/update-api-key
-curl -X POST -d username=accmurphy -d api_key=foo -d challenge=thingy -d value=123456abcdef https://quovadis.ucc.asn.au/update-challenge
+curl -X POST -d username=accmurphy https://quovadis.ucc.asn.au/quovadis/register
+curl -X POST -d username=accmurphy -d api_key=foo -d new_api_key=bar https://quovadis.ucc.asn.au/quovadis/update-api-key
+curl -X POST -d username=accmurphy -d api_key=foo -d challenge=thingy -d value=123456abcdef https://quovadis.ucc.asn.au/quovadis/update-challenge
 END;
 
     // In case any of our lines are larger than 70 characters, we should use wordwrap()
@@ -190,9 +190,9 @@ Rough API usage is:
 </p>
 
 <pre>
-curl -X POST -d username=accmurphy https://quovadis.ucc.asn.au/register
-curl -X POST -d username=accmurphy -d api_key=foo -d new_api_key=bar https://quovadis.ucc.asn.au/update-api-key
-curl -X POST -d username=accmurphy -d api_key=foo -d challenge=thingy -d value=123456abcdef https://quovadis.ucc.asn.au/update-challenge
+curl -X POST -d username=accmurphy https://quovadis.ucc.asn.au/quovadis/register
+curl -X POST -d username=accmurphy -d api_key=foo -d new_api_key=bar https://quovadis.ucc.asn.au/quovadis/update-api-key
+curl -X POST -d username=accmurphy -d api_key=foo -d challenge=thingy -d value=123456abcdef https://quovadis.ucc.asn.au/quovadis/update-challenge
 </pre>
 END;
 
diff --git a/scripts/certbot-hook-quovadis.sh b/scripts/certbot-hook-quovadis.sh
index 3985794..e462ed3 100755
--- a/scripts/certbot-hook-quovadis.sh
+++ b/scripts/certbot-hook-quovadis.sh
@@ -47,7 +47,7 @@ fi
 # Strip only the top domain to get the zone id
 DOMAIN=$(expr match "$CERTBOT_DOMAIN" '\(.*\)\.ucc\..*')
 
-BASE_API="${BASE_API:-https://quovadis.ucc.asn.au/}"
+BASE_API="${BASE_API:-https://quovadis.ucc.asn.au/quovadis}"
 
 # Create TXT record
 RECORD_ID=$(curl -s -X POST "$BASE_API/update-challenge" \
-- 
GitLab