Merge branch 'NginxProxyManager:develop' into pg-support

Merge pull request #4068 from Hadatko/fixWedosParamDescription
fixed wedos password description
2025-04-30 19:12:29 +00:00 · 2024-10-15 08:28:52 -03:00 · 2024-10-15 10:23:33 +10:00 · 2024-10-15 01:58:15 +02:00 · 2024-10-14 07:39:50 +10:00
3 changed files with 3 additions and 10 deletions
--- a/9
+++ b/9
@ -204,20 +204,13 @@ pipeline {
 		always {
 			sh 'echo Reverting ownership'
 			sh 'docker run --rm -v "$(pwd):/data" jc21/ci-tools chown -R "$(id -u):$(id -g)" /data'
-		}
-		success {
-			juxtapose event: 'success'
-			sh 'figlet "SUCCESS"'
+			printResult(true)
 		}
 		failure {
 			archiveArtifacts(artifacts: 'debug/**/*.*', allowEmptyArchive: true)
-			juxtapose event: 'failure'
-			sh 'figlet "FAILURE"'
 		}
 		unstable {
 			archiveArtifacts(artifacts: 'debug/**/*.*', allowEmptyArchive: true)
-			juxtapose event: 'unstable'
-			sh 'figlet "UNSTABLE"'
 		}
 	}
 }
--- a/global/certbot-dns-plugins.json
+++ b/global/certbot-dns-plugins.json
@ -492,7 +492,7 @@
 		"package_name": "certbot-dns-wedos",
 		"version": "~=2.2",
 		"dependencies": "",
-		"credentials": "dns_wedos_user = <wedos_registration>\ndns_wedos_auth = <wapi_sha256_password>",
+		"credentials": "dns_wedos_user = <wedos_registration>\ndns_wedos_auth = <wapi_password>",
 		"full_plugin_name": "dns-wedos"
 	},
 	"edgedns": {
--- a/scripts/ci/fulltest-cypress
+++ b/scripts/ci/fulltest-cypress
@ -65,7 +65,7 @@ rm -rf "${LOCAL_RESOLVE}"
 printf "nameserver %s\noptions ndots:0" "${DNSROUTER_IP}" > "${LOCAL_RESOLVE}"

 # bring up all remaining containers, except cypress!
-docker-compose up -d --remove-orphans stepca
+docker-compose up -d --remove-orphans stepca squid
 docker-compose pull db-mysql || true # ok to fail
 docker-compose up -d --remove-orphans --pull=never fullstack
Author	SHA1	Message	Date
jeffreysjauwmook	0987d7bba9	Merge branch 'NginxProxyManager:develop' into pg-support	2024-10-15 08:28:52 -03:00
jc21	3b89d5f380	Merge pull request #4068 from Hadatko/fixWedosParamDescription All checks were successful Close stale issues and PRs / stale (push) Successful in 5s Details fixed wedos password description	2024-10-15 10:23:33 +10:00
Dusan Cervenka	e5aa880ec4	fixed wedos password description Signed-off-by: Dusan Cervenka <cervenka.dusan@gmail.com>	2024-10-15 01:58:15 +02:00
Jamie Curnow	7322d35bd7	Fix CI All checks were successful Close stale issues and PRs / stale (push) Successful in 4s Details	2024-10-14 07:39:50 +10:00