Compare commits
7 commits
ab655c52d9
...
6a202f7f75
Author | SHA1 | Date | |
---|---|---|---|
6a202f7f75 | |||
33f0bab4ef | |||
c2b3a78617 | |||
e41d0e976f | |||
ccc7619a6b | |||
f33bc6bbab | |||
31e2875965 |
2 changed files with 68 additions and 39 deletions
|
@ -236,14 +236,14 @@ Handle project workflows in a unified way:
|
|||
* pacman
|
||||
* zypper
|
||||
* repositories
|
||||
* codecs
|
||||
* epel
|
||||
* fedora
|
||||
* opensuse
|
||||
* opensuse
|
||||
* codecs repository
|
||||
* disable & enable https
|
||||
* persist locales
|
||||
* test
|
||||
* variables
|
||||
* CA_n
|
||||
* DNS_n
|
||||
|
||||
#### Shell → Python
|
||||
|
||||
|
|
|
@ -199,6 +199,65 @@ _spcd_txt_pick() {
|
|||
# │ functions │
|
||||
# ╰───────────╯
|
||||
|
||||
spcd_ca() {
|
||||
local index name value
|
||||
local grep="\(After\|Before\|Issuer\|Signature Algorithm\|Subject:\)"
|
||||
case "${1}" in
|
||||
"list")
|
||||
while true; do
|
||||
index=$((index + 1))
|
||||
name="SPCD_CA_${index}"
|
||||
eval "value=\"\${name}\""
|
||||
[ -n "${value}" ] || break
|
||||
echo "${name} ="
|
||||
echo "${value}" |
|
||||
openssl x509 -noout -text |
|
||||
grep "${grep}"
|
||||
done
|
||||
;;
|
||||
"write")
|
||||
local root="${2}"
|
||||
while true; do
|
||||
index=$((index + 1))
|
||||
name="SPCD_CA_${index}"
|
||||
eval "value=\"\${name}\""
|
||||
[ -n "${value}" ] || break
|
||||
spcd_os_write "${root}/${index}.crt" "${value}"
|
||||
done
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
}
|
||||
|
||||
spcd_dns() {
|
||||
local index name value
|
||||
case "${1}" in
|
||||
"list")
|
||||
while true; do
|
||||
index=$((index + 1))
|
||||
name="SPCD_DNS_${index}"
|
||||
eval "value=\"\${name}\""
|
||||
[ -n "${value}" ] || break
|
||||
spcd_os_printenv "${name}"
|
||||
done
|
||||
;;
|
||||
"write")
|
||||
local text
|
||||
while true; do
|
||||
index=$((index + 1))
|
||||
name="SPCD_DNS_${index}"
|
||||
eval "value=\"\${name}\""
|
||||
[ -n "${value}" ] || break
|
||||
text="${text}\
|
||||
nameserver ${value}
|
||||
"
|
||||
done
|
||||
spcd_os_write "/etc/resolv.conf" "${text}"
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
}
|
||||
|
||||
# ╭───────────┬───────╮
|
||||
# │ functions │ error │
|
||||
# ╰───────────┴───────╯
|
||||
|
@ -214,19 +273,6 @@ spcd_error_os() {
|
|||
exit "${_SPCD_ERROR_OS}"
|
||||
}
|
||||
|
||||
# ╭───────────┬─────────╮
|
||||
# │ functions │ openssl │
|
||||
# ╰───────────┴─────────╯
|
||||
|
||||
spcd_openssl_x509() {
|
||||
if [ -f "${1}" ]; then
|
||||
openssl x509 \
|
||||
-in "${1}" \
|
||||
-noout -text |
|
||||
grep "\(After\|Before\|Issuer\|Signature A\|Subject:\)"
|
||||
fi
|
||||
}
|
||||
|
||||
# ╭───────────┬────╮
|
||||
# │ functions │ os │
|
||||
# ╰───────────┴────╯
|
||||
|
@ -434,9 +480,9 @@ SPCD_PM_ZYPPER="zypper"
|
|||
# ╰──────┴─────────────╯
|
||||
|
||||
spcd_step__environment_defaults_print() {
|
||||
spcd_ca "list"
|
||||
spcd_dns "list"
|
||||
set -- \
|
||||
\
|
||||
\
|
||||
"GIT_RWX" \
|
||||
"GIT_SPCD" \
|
||||
"GIT_SHUNIT" \
|
||||
|
@ -896,16 +942,7 @@ spcd_query_package() {
|
|||
|
||||
spcd_step__dns() {
|
||||
spcd_step "DNS"
|
||||
local index value text
|
||||
while true; do
|
||||
index=$((index + 1))
|
||||
eval "value=\"\${SPCD_DNS_${index}}\""
|
||||
[ -n "${value}" ] || break
|
||||
text="${text}\
|
||||
nameserver ${value}
|
||||
"
|
||||
done
|
||||
spcd_os_write "/etc/resolv.conf" "${text}"
|
||||
spcd_dns "write"
|
||||
}
|
||||
|
||||
# ╭──────┬──────────╮
|
||||
|
@ -1152,7 +1189,7 @@ spcd_step__ca_install_package() {
|
|||
|
||||
spcd_step__ca_write_certificates() {
|
||||
spcd_step "Write certificates"
|
||||
local root index text path
|
||||
local root
|
||||
case "${SPCD_OS_ID}" in
|
||||
"${SPCD_OS_ALMA}" | "${SPCD_OS_FEDORA}" | "${SPCD_OS_ROCKY}")
|
||||
root="/etc/pki/ca-trust/source/anchors"
|
||||
|
@ -1169,15 +1206,7 @@ spcd_step__ca_write_certificates() {
|
|||
*) ;;
|
||||
esac
|
||||
spcd_os_mkdir "${root}"
|
||||
while true; do
|
||||
index=$((index + 1))
|
||||
eval "text=\"\${SPCD_CA_${index}}\""
|
||||
[ -n "${text}" ] || break
|
||||
path="${root}/${index}.crt"
|
||||
spcd_split
|
||||
spcd_os_write "${path}" "${text}"
|
||||
spcd_openssl_x509 "${path}"
|
||||
done
|
||||
spcd_ca "write" "${root}"
|
||||
}
|
||||
|
||||
spcd_step__ca_update_certificates() {
|
||||
|
|
Loading…
Reference in a new issue