7 Commits

Author SHA1 Message Date
e850fedf8a Improve ssl cert symlinking 2022-04-02 12:11:45 -04:00
1803ddd055 Improve ssl cert symlinking 2022-04-02 12:10:17 -04:00
eae4a02cb4 Improve ssl cert symlinking 2022-04-02 12:01:23 -04:00
82bb787b59 Increment version 2022-04-02 11:45:55 -04:00
a3d23a1d81 Merge branch 'master' into dev 2022-04-02 11:44:38 -04:00
7edc328cf1 Improve ssl cert symlinking 2022-04-02 11:42:20 -04:00
2296a43a31 Improve ssl cert symlinking 2022-04-02 11:41:31 -04:00

View File

@@ -18,7 +18,7 @@
shopt -s extglob shopt -s extglob
declare -g SCRIPTVERSION="1.0b15" declare -g SCRIPTVERSION="1.0b16"
declare -g OUTPUTDIR="$PWD/output" declare -g OUTPUTDIR="$PWD/output"
declare -g CREATEREPO_WEBROOT="/var/www/jriver" declare -g CREATEREPO_WEBROOT="/var/www/jriver"
declare -g USER="${SUDO_USER:-$USER}" declare -g USER="${SUDO_USER:-$USER}"
@@ -737,20 +737,31 @@ runCreaterepo() {
####################################### #######################################
# Symlink certificates where JRiver Media Center expects them to be on Fedora/CentOS # Symlink certificates if they do not exist in default location
####################################### #######################################
symlinkCerts() { symlinkCerts() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
if [[ ! -f /etc/ssl/certs/ca-certificates.crt && declare mc_cert_link="/usr/lib/jriver/Media Center $MVERSION/ca-certificates.crt"
-f /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ]]; then declare target_cert
debug "ln -s /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/ssl/certs/ca-certificates.crt" declare -a ln_cmd
if ! sudo ln -s /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem \
/etc/ssl/certs/ca-certificates.crt; then target_cert=$(readlink -f "$mc_cert_link")
[[ -f $target_cert ]] && return 0
# Have to use command array instead of eval because of whitespace in $mc_cert_link
if [[ -f /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem ]]; then
ln_cmd=("sudo" "ln" "-fs" "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" "$mc_cert_link") # For RHEL
elif [[ -f /var/lib/ca-certificates/ca-bundle.pem ]]; then
ln_cmd=("sudo" "ln" "-fs" "/var/lib/ca-certificates/ca-bundle.pem" "$mc_cert_link") # For SUSE
fi
debug "${ln_cmd[*]}"
if ! "${ln_cmd[@]}"; then
err "Symlinking certificates failed" err "Symlinking certificates failed"
return 1 return 1
fi fi
fi
} }