From 7322d35bd734d3694c111a4883e834435bb4b00d Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Mon, 14 Oct 2024 07:21:04 +1000
Subject: [PATCH 1/2] Fix CI

---
 Jenkinsfile                 | 9 +--------
 scripts/ci/fulltest-cypress | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ae631f93..75757946 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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"'
 		}
 	}
 }
diff --git a/scripts/ci/fulltest-cypress b/scripts/ci/fulltest-cypress
index 7e4469fe..9101189c 100755
--- 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
 

From e5aa880ec41c5a46f49c515a11240b4a0dd5a716 Mon Sep 17 00:00:00 2001
From: Dusan Cervenka <cervenka.dusan@gmail.com>
Date: Tue, 15 Oct 2024 01:58:15 +0200
Subject: [PATCH 2/2] fixed wedos password description

Signed-off-by: Dusan Cervenka <cervenka.dusan@gmail.com>
---
 global/certbot-dns-plugins.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global/certbot-dns-plugins.json b/global/certbot-dns-plugins.json
index bc3cfa7a..6729842e 100644
--- 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": {