ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update openmediavault.sh

Browse Source 
Improve log/debug, fix shellcheck SC2034
This commit is contained in:
eddul-h 2021-10-15 10:08:17 +02:00 committed by GitHub
parent 437f052fe2
commit 53dba6bfaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
deploy/openmediavault.sh
View File

@ -23,36 +23,35 @@ openmediavault_deploy() {
# shellcheck disable=SC2086 # shellcheck disable=SC2086
_uuid=$(omv-rpc -u "$DEPLOY_OMV_USER" 'CertificateMgmt' 'getList' '{"start": 0, "limit": -1}' | jq -r '.data[] | select(.name=="/CN='$_cdomain'") | .uuid') _uuid=$(omv-rpc -u "$DEPLOY_OMV_USER" 'CertificateMgmt' 'getList' '{"start": 0, "limit": -1}' | jq -r '.data[] | select(.name=="/CN='$_cdomain'") | .uuid')
if [ -z "$_uuid" ]; then if [ -z "$_uuid" ]; then
echo "Domain $_cdomain has no certificate in Openmediavault, creating it!" _info "[OMV deploy-hook] Domain $_cdomain has no certificate in Openmediavault, creating it!"
_uuid=$(omv-rpc -u "$DEPLOY_OMV_USER" 'CertificateMgmt' 'create' '{"cn": "test.example.com", "size": 4096, "days": 3650, "c": "", "st": "", "l": "", "o": "", "ou": "", "email": ""}' | jq -r '.uuid') _uuid=$(omv-rpc -u "$DEPLOY_OMV_USER" 'CertificateMgmt' 'create' '{"cn": "test.example.com", "size": 4096, "days": 3650, "c": "", "st": "", "l": "", "o": "", "ou": "", "email": ""}' | jq -r '.uuid')
if [ -z "$_uuid" ]; then if [ -z "$_uuid" ]; then
echo "An error occured while creating the certificate" _err "[OMB deploy-hook] An error occured while creating the certificate"
return 1 return 1
fi fi
fi fi
echo "Domain $_cdomain has uuid: $_uuid" _info "[OMV deploy-hook] Domain $_cdomain has uuid: $_uuid"
_fullchain=$(jq <"$_cfullchain" -aRs .) _fullchain=$(jq <"$_cfullchain" -aRs .)
_key=$(jq <"$_ckey" -aRs .) _key=$(jq <"$_ckey" -aRs .)
#echo "$_fullchain" _debug _fullchain "$_fullchain"
#echo "$_key" _debug _key "$_key"
echo "Updating key and certificate in Openmediavault" _info "[OMV deploy-hook] Updating key and certificate in Openmediavault"
_command="omv-rpc -u $DEPLOY_OMV_USER 'CertificateMgmt' 'set' '{\"uuid\":\"$_uuid\", \"certificate\":$_fullchain, \"privatekey\":$_key, \"comment\":\"acme.sh deployed $(date)\"}'" _command="omv-rpc -u $DEPLOY_OMV_USER 'CertificateMgmt' 'set' '{\"uuid\":\"$_uuid\", \"certificate\":$_fullchain, \"privatekey\":$_key, \"comment\":\"acme.sh deployed $(date)\"}'"
_result=$(eval "$_command") _result=$(eval "$_command")
#echo "$_command" _debug _command "$_command"
#echo "$_result" _debug _result "$_result"
echo "Asking Openmediavault to apply changes... (this could take some time, hang in there)" _info "[OMV deploy-hook] Asking Openmediavault to apply changes... (this could take some time, hang in there)"
_command="omv-rpc -u $DEPLOY_OMV_USER 'Config' 'applyChanges' '{\"modules\":[\"certificates\"], \"force\": false}'" _command="omv-rpc -u $DEPLOY_OMV_USER 'Config' 'applyChanges' '{\"modules\":[\"certificates\"], \"force\": false}'"
_result=$(eval "$_command") _result=$(eval "$_command")
#echo "$_command" _debug _command "$_command"
#echo "$_result" _debug _result "$_result"
return 0 return 0
} }