From 7c473cb56cc282956fd7bcd826c86f9d0af0165e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 22 Aug 2024 10:13:00 +0200 Subject: [PATCH] Escape comma character in gitea password generation Change-Id: I772da78412076a6d557faa82ee014abd2a489fc3 Signed-off-by: garciadeblas --- installers/mgmt-cluster/01-provision-aux-svc.sh | 2 +- installers/mgmt-cluster/gitea/00-custom-config.rc | 4 ++-- installers/mgmt-cluster/gitea/90-provision-gitea-for-osm.sh | 2 +- installers/mgmt-cluster/gitea/ALL-IN-ONE-Gitea-install.sh | 2 +- installers/mgmt-cluster/gitea/admin/create-user-repository.sh | 2 +- installers/mgmt-cluster/gitea/admin/create-user.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/installers/mgmt-cluster/01-provision-aux-svc.sh b/installers/mgmt-cluster/01-provision-aux-svc.sh index 4f00732f..ddd3cbfd 100755 --- a/installers/mgmt-cluster/01-provision-aux-svc.sh +++ b/installers/mgmt-cluster/01-provision-aux-svc.sh @@ -16,7 +16,7 @@ # limitations under the License. ####################################################################################### -set -ex -o pipefail +set -e -o pipefail # Warning!!!: Remember to select the desired kubeconfig profile before launching this script diff --git a/installers/mgmt-cluster/gitea/00-custom-config.rc b/installers/mgmt-cluster/gitea/00-custom-config.rc index 46665856..89c7e2f3 100644 --- a/installers/mgmt-cluster/gitea/00-custom-config.rc +++ b/installers/mgmt-cluster/gitea/00-custom-config.rc @@ -18,8 +18,8 @@ # Transitent file to be sourced to bootstrap some key variables # Random passwords -export GITEA_ADMINISTRATOR_PASSWORD=$(apg -a 1 -M sncl -n 1 -m 12 -x 12 -E \\\*\'\"\`\$\<\>\{\}) -export GITEA_STD_USER_PASS=$(apg -a 1 -M sncl -n 1 -m 10 -x 10 -E \\\*\'\"\`\$\<\>\{\}) +export GITEA_ADMINISTRATOR_PASSWORD=$(apg -a 1 -M sncl -n 1 -m 12 -x 12 -E \\\*\'\"\`\$\<\>\{\}\,) +export GITEA_STD_USER_PASS=$(apg -a 1 -M sncl -n 1 -m 10 -x 10 -E \\\*\'\"\`\$\<\>\{\}\,) # Uncomment to deploy Gitea only as ClusterIP service (i.e., no LoadBalancer) # export GITEA_CHART_VALUES_FILE=values-all.yaml diff --git a/installers/mgmt-cluster/gitea/90-provision-gitea-for-osm.sh b/installers/mgmt-cluster/gitea/90-provision-gitea-for-osm.sh index 5931e900..f2ada07b 100755 --- a/installers/mgmt-cluster/gitea/90-provision-gitea-for-osm.sh +++ b/installers/mgmt-cluster/gitea/90-provision-gitea-for-osm.sh @@ -16,7 +16,7 @@ # limitations under the License. ####################################################################################### -set -ex -o pipefail +set -e -o pipefail export HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")") source "${HERE}/library/functions.sh" diff --git a/installers/mgmt-cluster/gitea/ALL-IN-ONE-Gitea-install.sh b/installers/mgmt-cluster/gitea/ALL-IN-ONE-Gitea-install.sh index 7bcd78c7..b6bbffd8 100755 --- a/installers/mgmt-cluster/gitea/ALL-IN-ONE-Gitea-install.sh +++ b/installers/mgmt-cluster/gitea/ALL-IN-ONE-Gitea-install.sh @@ -16,7 +16,7 @@ # limitations under the License. ####################################################################################### -set -ex -o pipefail +set -e -o pipefail export HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")") source "${HERE}/library/functions.sh" diff --git a/installers/mgmt-cluster/gitea/admin/create-user-repository.sh b/installers/mgmt-cluster/gitea/admin/create-user-repository.sh index edaa3585..686c1a94 100755 --- a/installers/mgmt-cluster/gitea/admin/create-user-repository.sh +++ b/installers/mgmt-cluster/gitea/admin/create-user-repository.sh @@ -16,7 +16,7 @@ # limitations under the License. ####################################################################################### -set -ex +set -e HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")") . "$HERE/../library/functions.sh" diff --git a/installers/mgmt-cluster/gitea/admin/create-user.sh b/installers/mgmt-cluster/gitea/admin/create-user.sh index 6208d26b..68124278 100755 --- a/installers/mgmt-cluster/gitea/admin/create-user.sh +++ b/installers/mgmt-cluster/gitea/admin/create-user.sh @@ -16,7 +16,7 @@ # limitations under the License. ####################################################################################### -set -ex +set -e HERE=$(dirname "$(readlink --canonicalize "$BASH_SOURCE")") source "${HERE}/../library/functions.sh" -- 2.25.1