From 9ecbd6f59df11d6987abf0a4ca5e5b0ade680f7e Mon Sep 17 00:00:00 2001 From: Miraty Date: Mon, 20 Jan 2025 17:27:09 +0100 Subject: [PATCH] setup-xoq.sh: strip CR char for podman compatibility --- setup-xoq.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup-xoq.sh b/setup-xoq.sh index 3dbfdda..4721a79 100755 --- a/setup-xoq.sh +++ b/setup-xoq.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash -ENGINE="docker" +ENGINE="podman" # "podman" or "docker" $ENGINE-compose exec knot-secondary knotc conf-begin $ENGINE-compose exec knot-secondary knotc conf-unset remote[primary].cert-key -$ENGINE-compose exec knot-secondary knotc conf-set remote[primary].cert-key $($ENGINE-compose exec knot cat /var/log/knot/knot.log | grep "certificate public key" | cut -d " " -f 7 | tail -1) +$ENGINE-compose exec knot-secondary knotc conf-set remote[primary].cert-key "$($ENGINE-compose exec knot cat /var/log/knot/knot.log | grep "certificate public key" | cut -d " " -f 7 | tail -1 | tr -d "\r")" $ENGINE-compose exec knot-secondary knotc conf-commit $ENGINE-compose exec knot knotc conf-begin $ENGINE-compose exec knot knotc conf-unset remote[secondary].cert-key -$ENGINE-compose exec knot knotc conf-set remote[secondary].cert-key $($ENGINE-compose exec knot-secondary cat /var/log/knot/knot.log | grep "certificate public key" | cut -d " " -f 7 | tail -1) +$ENGINE-compose exec knot knotc conf-set remote[secondary].cert-key "$($ENGINE-compose exec knot-secondary cat /var/log/knot/knot.log | grep "certificate public key" | cut -d " " -f 7 | tail -1 | tr -d "\r")" $ENGINE-compose exec knot knotc conf-commit