From 725ad1acd166aef90bdc2588568f6e9397520425 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 3 May 2024 20:00:28 +0200 Subject: [PATCH] https --- cd.sh | 34 ++++++++++++++++------------------ readme.md | 5 +++-- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/cd.sh b/cd.sh index 0ff0821..a61e8ef 100644 --- a/cd.sh +++ b/cd.sh @@ -178,21 +178,20 @@ Dir::Etc::SourceParts \"\"; } cd_set_https_verification_off () { - if [ "${CD_CA}" ] ; then - cd_step "Set HTTPS verification off" - case "${CD_OS_ID}" in - "${CD_OS_DEBIAN}") - cd_write "/etc/apt/apt.conf.d/https" "\ + [ "${CD_CA}" ] || [ "${CD_OS_ID}" = "${CD_OS_DEBIAN}" ] || exit + cd_step "Set HTTPS verification off" + case "${CD_OS_ID}" in + "${CD_OS_DEBIAN}") + cd_write "/etc/apt/apt.conf.d/https" "\ Acquire::https::Verify-Peer False; " - ;; - "${CD_OS_ALMA}") - cd_write "/etc/dnf/dnf.conf.d/https.conf" "\ + ;; + "${CD_OS_ALMA}") + cd_write "/etc/dnf/dnf.conf.d/https.conf" "\ sslverify=False " - ;; - esac - fi + ;; + esac } cd_update_packages_catalog () { @@ -239,13 +238,12 @@ cd_update_ca_certificates () { } cd_set_https_verification_on () { - if [ "${CD_CA}" ] ; then - cd_step "Set HTTPS verification on" - case "${CD_OS_ID}" in - "${CD_OS_DEBIAN}") cd_rm "/etc/apt/apt.conf.d/https" ;; - "${CD_OS_ALMA}") cd_rm "/etc/dnf/dnf.conf.d/https.conf" ;; - esac - fi + [ "${CD_CA}" ] || [ "${CD_OS_ID}" = "${CD_OS_DEBIAN}" ] || exit + cd_step "Set HTTPS verification on" + case "${CD_OS_ID}" in + "${CD_OS_DEBIAN}") cd_rm "/etc/apt/apt.conf.d/https" ;; + "${CD_OS_ALMA}") cd_rm "/etc/dnf/dnf.conf.d/https.conf" ;; + esac } cd_upgrade_packages () { diff --git a/readme.md b/readme.md index 5800715..4498d1f 100644 --- a/readme.md +++ b/readme.md @@ -29,8 +29,9 @@ from various CA, CI, OCI / OS. ## Tasks -* first list working directory * handle cloning credentials +* write Python bootstrap + +* first list working directory * integrate project repository cloning * override repository and framework locations -* write Python bootstrap