From 550c00f4dd0ce3774514cdbf009c7a346f92f1ae Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 10 May 2024 22:24:42 +0200 Subject: [PATCH 1/5] arch/pkg/ca --- cd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd.sh b/cd.sh index 48830dc..ace2502 100644 --- a/cd.sh +++ b/cd.sh @@ -165,7 +165,7 @@ skip_if_unavailable=False CD_CMD_QUERY="pacman --query" CD_CMD_UPDATE="pacman --sync --refresh" CD_CMD_UPGRADE="pacman --sync --sysupgrade --noconfirm" - # TODO + CD_PKG_CA="ca-certificates" CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" From 6efaec810fc50e2e379b0b8d5108c4c1145ceb40 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 10 May 2024 22:25:17 +0200 Subject: [PATCH 2/5] https & python --- readme.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/readme.md b/readme.md index 0f0cca5..8b6bf8f 100644 --- a/readme.md +++ b/readme.md @@ -49,6 +49,20 @@ from various CA, CI, OCI / OS. | CD_URL_ROCKY | Rocky repository URL | | CD_URL_UBUNTU | Ubuntu repository URL | +## HTTPS & Python + +| OS img | crt | upd | Python | +|:--------|-----|-----|:---------| +| Alma 8 | [X] | [X] | [ ] | +| Alma 9 | [X] | [X] | [X] 3.9 | +| Alpine | [X] | [ ] | [ ] | +| Arch | [X] | [X] | [ ] | +| Debian | [ ] | [ ] | [ ] | +| Fedora | [X] | [X] | [X] 3.12 | +| Rocky 8 | [X] | [X] | [ ] | +| Rocky 9 | [X] | [X] | [X] 3.9 | +| Ubuntu | [ ] | [ ] | [ ] | + ## Tasks * write bats From aa7d2718a7d75b5675706143496e852bf03cbfa4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 10 May 2024 22:33:13 +0200 Subject: [PATCH 3/5] readme/arch,fedora --- readme.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/readme.md b/readme.md index 8b6bf8f..d161140 100644 --- a/readme.md +++ b/readme.md @@ -12,22 +12,22 @@ from various CA, CI, OCI / OS. * [X] GitHub → Gitea → ForgeJo * [X] GitLab * [ ] SourceHut -* [ ] Operating Systems +* [X] Operating Systems * [X] Alma → Python 3.11 * [X] 8 * [X] 9 * [X] Alpine → Python 3.11 * [X] 3.18 * [X] 3.19 - * [ ] Arch → Python 3.12 - * [ ] 20231112 - * [ ] 20240101 + * [X] Arch → Python 3.12 + * [X] 20231112 + * [X] 20240101 * [X] Debian * [X] Bullseye (11) → Python 3.9 * [X] Bookworm (12) → Python 3.11 - * [ ] Fedora → Python 3.12 - * [ ] 39 - * [ ] 40 + * [X] Fedora → Python 3.12 + * [X] 39 + * [X] 40 * [X] Rocky → Python 3.11 * [X] 8 * [X] 9 From f2c422c909684be955172584d76310c399787376 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 10 May 2024 22:40:01 +0200 Subject: [PATCH 4/5] ca --- cd.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/cd.sh b/cd.sh index ace2502..a680ed3 100644 --- a/cd.sh +++ b/cd.sh @@ -106,24 +106,32 @@ cd_set_environment_variables () { CD_DNS_FILE="/etc/resolv.conf" CD_PKG_GIT="git" cd_split - cd_echo "CD_DNS_FILE" "CD_PKG_CA" "CD_PKG_GIT" + cd_echo "CD_DNS_FILE" "CD_PKG_GIT" # shared case "${CD_OS_ID}" in "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") CD_CA_ROOT="/etc/pki/ca-trust/source/anchors" CD_CMD_CA="update-ca-trust" + CD_PKG_CA="ca-certificates" + ;; + "${CD_OS_ALPINE}") + CD_CA_ROOT="/usr/local/share/ca-certificates" + CD_CMD_CA="update-ca-certificates" + CD_PKG_CA="ca-certificates-bundle" ;; "${CD_OS_ARCH}") CD_CA_ROOT="/etc/ca-certificates/trust-source/anchors" CD_CMD_CA="update-ca-trust" + CD_PKG_CA="ca-certificates" ;; - "${CD_OS_ALPINE}"|"${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") CD_CA_ROOT="/usr/local/share/ca-certificates" CD_CMD_CA="update-ca-certificates" + CD_PKG_CA="ca-certificates" ;; esac cd_split - cd_echo "CD_CA_ROOT" "CD_CMD_CA" + cd_echo "CD_CA_ROOT" "CD_CMD_CA" "CD_PKG_CA" # common case "${CD_OS_ID}" in "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") @@ -132,7 +140,6 @@ cd_set_environment_variables () { CD_CMD_QUERY="rpm --query" CD_CMD_UPDATE="dnf makecache" CD_CMD_UPGRADE="dnf upgrade --assumeyes" - CD_PKG_CA="ca-certificates" CD_PKG_PKG="" CD_PM_CONF_PATH="/etc/dnf/dnf.conf" CD_PM_CONF_TEXT="\ @@ -152,7 +159,6 @@ skip_if_unavailable=False CD_CMD_QUERY="apk info" CD_CMD_UPDATE="apk update" CD_CMD_UPGRADE="apk upgrade" - CD_PKG_CA="ca-certificates-bundle" CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" @@ -165,7 +171,6 @@ skip_if_unavailable=False CD_CMD_QUERY="pacman --query" CD_CMD_UPDATE="pacman --sync --refresh" CD_CMD_UPGRADE="pacman --sync --sysupgrade --noconfirm" - CD_PKG_CA="ca-certificates" CD_PKG_PKG="" CD_PM_CONF_PATH="" CD_PM_CONF_TEXT="" @@ -178,7 +183,6 @@ skip_if_unavailable=False CD_CMD_QUERY="dpkg-query --show" CD_CMD_UPDATE="apt-get update" CD_CMD_UPGRADE="apt-get upgrade --assume-yes" - CD_PKG_CA="ca-certificates" CD_PKG_PKG="apt-utils" CD_PM_CONF_PATH="/etc/apt/apt.conf.d/apt.conf" CD_PM_CONF_TEXT="\ From da2b2fa97a656ae86d667dfa54542e58c99b2ec2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Fri, 10 May 2024 23:26:31 +0200 Subject: [PATCH 5/5] cd_pm --- cd.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index a680ed3..ef93f21 100644 --- a/cd.sh +++ b/cd.sh @@ -135,6 +135,7 @@ cd_set_environment_variables () { # common case "${CD_OS_ID}" in "${CD_OS_ALMA}"|"${CD_OS_FEDORA}"|"${CD_OS_ROCKY}") + CD_PM="${CD_PM_DNF}" CD_CMD_CLEAN="dnf clean all" CD_CMD_INSTALL="dnf install --assumeyes" CD_CMD_QUERY="rpm --query" @@ -154,6 +155,7 @@ skip_if_unavailable=False CD_PM_HTTPS_TEXT="sslverify=False" ;; "${CD_OS_ALPINE}") + CD_PM="${CD_PM_APK}" CD_CMD_CLEAN="apk cache purge" CD_CMD_INSTALL="apk add" CD_CMD_QUERY="apk info" @@ -166,6 +168,7 @@ skip_if_unavailable=False CD_PM_HTTPS_TEXT="--no-verify" ;; "${CD_OS_ARCH}") + CD_PM="${CD_PM_PACMAN}" CD_CMD_CLEAN="pacman --sync --clean --noconfirm" CD_CMD_INSTALL="pacman --sync --noconfirm" CD_CMD_QUERY="pacman --query" @@ -178,6 +181,7 @@ skip_if_unavailable=False CD_PM_HTTPS_TEXT="SSLVerify = No" ;; "${CD_OS_DEBIAN}"|"${CD_OS_UBUNTU}") + CD_PM="${CD_PM_APT}" CD_CMD_CLEAN="apt-get clean" CD_CMD_INSTALL="apt-get install --assume-yes" CD_CMD_QUERY="dpkg-query --show" @@ -405,8 +409,7 @@ cd_list_working_directory () { } cd_set_https_verification_off () { - # TODO - if [ "${CD_CA}" -o "${CD_OS_ID}" = "${CD_OS_DEBIAN}" ] ; then + if [ "${CD_CA}" -o "${CD_PM}" = "${CD_PM_APT}" ] ; then cd_step "Set HTTPS verification off" cd_mkdir "$(dirname "${CD_PM_HTTPS_PATH}")" cd_write "${CD_PM_HTTPS_PATH}" "${CD_PM_HTTPS_TEXT}" @@ -669,5 +672,10 @@ CD_OS_FEDORA="fedora" CD_OS_ROCKY="rocky" CD_OS_UBUNTU="ubuntu" +CD_PM_APK="apk" +CD_PM_APT="apt" +CD_PM_DNF="dnf" +CD_PM_PACMAN="pacman" + # run cd_main