Merge 1f28700749ff68a446d9742bd75da0b29f020445 into 3a01b2c84f2b0dc31fbd1f2bb962a2495ba27990

Merge pull request #4334 from nwagenmakers/mijn-host-patch
Update certbot-dns-plugins.json (mijn-host)
2025-06-14 16:34:27 +00:00 · 2025-02-05 09:41:16 -06:00 · 2025-02-05 20:36:06 +10:00 · 2025-02-05 20:35:33 +10:00 · 2025-02-03 21:47:41 +01:00 · 2025-02-01 13:10:53 +01:00
5 changed files with 8 additions and 9 deletions
--- a/backend/schema/components/token-object.json
+++ b/backend/schema/components/token-object.json
@ -5,10 +5,9 @@
 	"additionalProperties": false,
 	"properties": {
 		"expires": {
-			"description": "Token Expiry Unix Time",
+			"description": "Token Expiry ISO Time String",
-			"example": 1566540249,
+			"example": "2025-02-04T20:40:46.340Z",
-			"minimum": 1,
+			"type": "string"
 			"type": "number"
 		},
 		"token": {
 			"description": "JWT Token",
--- a/backend/schema/paths/tokens/get.json
+++ b/backend/schema/paths/tokens/get.json
@ -15,7 +15,7 @@
 					"examples": {
 						"default": {
 							"value": {
-								"expires": 1566540510,
+								"expires": "2025-02-04T20:40:46.340Z",
 								"token": "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.ey...xaHKYr3Kk6MvkUjcC4"
 							}
 						}
--- a/backend/schema/paths/tokens/post.json
+++ b/backend/schema/paths/tokens/post.json
@ -38,7 +38,7 @@
 						"default": {
 							"value": {
 								"result": {
-									"expires": 1566540510,
+									"expires": "2025-02-04T20:40:46.340Z",
 									"token": "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.ey...xaHKYr3Kk6MvkUjcC4"
 								}
 							}
--- a/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/force-ssl.conf
@ -2,7 +2,7 @@ set $test "";
 if ($scheme = "http") {
 	set $test "H";
 }
-if ($request_uri = /.well-known/acme-challenge/test-challenge) {
+if ($request_uri ~* /.well-known/acme-challenge/) {
 	set $test "${test}T";
 }
 if ($test = H) {
--- a/global/certbot-dns-plugins.json
+++ b/global/certbot-dns-plugins.json
@ -364,7 +364,7 @@
 		"package_name": "certbot-dns-mijn-host",
 		"version": "~=0.0.4",
 		"dependencies": "",
-		"credentials": "dns-mijn-host-credentials = /etc/letsencrypt/mijnhost-credentials.ini",
+		"credentials": "dns_mijn_host_api_key=0123456789abcdef0123456789abcdef",
 		"full_plugin_name": "dns-mijn-host"
 	},
 	"namecheap": {
@ -535,4 +535,4 @@
 		"credentials": "edgedns_client_secret = as3d1asd5d1a32sdfsdfs2d1asd5=\nedgedns_host = sdflskjdf-dfsdfsdf-sdfsdfsdf.luna.akamaiapis.net\nedgedns_access_token = kjdsi3-34rfsdfsdf-234234fsdfsdf\nedgedns_client_token = dkfjdf-342fsdfsd-23fsdfsdfsdf",
 		"full_plugin_name": "edgedns"
 	}
-}
+}
Author	SHA1	Message	Date
MeCJay12	82a2311e37	Merge 1f28700749ff68a446d9742bd75da0b29f020445 into 3a01b2c84f2b0dc31fbd1f2bb962a2495ba27990	2025-02-05 09:41:16 -06:00
jc21	3a01b2c84f	Merge pull request #4334 from nwagenmakers/mijn-host-patch All checks were successful Close stale issues and PRs / stale (push) Successful in 4s Details Update certbot-dns-plugins.json (mijn-host)	2025-02-05 20:36:06 +10:00
jc21	e1c84a5c10	Merge pull request #4338 from Sander0542/fix/token-expires-type Fix type for token.expires	2025-02-05 20:35:33 +10:00
Sander Jochems	57cd2a1919	Fix type for token.expires	2025-02-03 21:47:41 +01:00
nwagenmakers	ad5936c530	Update certbot-dns-plugins.json (mijn-host) Updated credentials hint/text in mijn-host plugin entry	2025-02-01 13:10:53 +01:00
MeCJay12	1f28700749	Update force-ssl.conf Modify Force SSL to bypass all Let's Encrypt requests	2025-01-04 22:49:44 -05:00