yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-05 20:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating openhab script

Browse Source 
General cleanup, better errors, saving config variables, debug statements
This commit is contained in:
David Tschida 2022-11-15 18:00:35 -08:00
parent 39180230b2
commit 72bf38c47c
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
deploy/openhabian.sh
View File

@ -6,7 +6,7 @@
openhabian_deploy() { openhabian_deploy() {
# Name parameters # Name parameters, load configs
_cdomain="$1" _cdomain="$1"
_ckey="$2" _ckey="$2"
_ccert="$3" _ccert="$3"
@ -19,14 +19,26 @@ openhabian_deploy() {
_debug _cca "$_cca" _debug _cca "$_cca"
_debug _cfullchain "$_cfullchain" _debug _cfullchain "$_cfullchain"
# TODO: Load from config using _getdeployconf and print with _debug2 _getdeployconf DEPLOY_UNIFI_KEYSTORE
# Unclear if this is needed in this case. _getdeployconf DEPLOY_OPENHABIAN_KEYPASS
_getdeployconf DEPLOY_OPENHABIAN_RESTART
_debug2 DEPLOY_UNIFI_KEYSTORE "$DEPLOY_UNIFI_KEYSTORE"
_debug2 DEPLOY_OPENHABIAN_KEYPASS "$DEPLOY_OPENHABIAN_KEYPASS"
_debug2 DEPLOY_OPENHABIAN_RESTART "$DEPLOY_OPENHABIAN_RESTART"
# Define configurable options # Define configurable options
_openhab_keystore=${DEPLOY_OPENHABIAN_KEYSTORE:-${OPENHAB_USERDATA}/etc/keystore} _openhab_keystore="${DEPLOY_OPENHABIAN_KEYSTORE:-${OPENHAB_USERDATA}/etc/keystore}"
_openhab_keypass="${DEPLOY_OPENHABIAN_KEYPASS:-openhab}" _openhab_keypass="${DEPLOY_OPENHABIAN_KEYPASS:-openhab}"
_default_restart="sudo service openhab resart"
_openhab_restart="${DEPLOY_OPENHABIAN_RESTART:-$_default_restart}"
_debug _openhab_keystore "$_openhab_keystore"
_debug _openhab_keypass "$_openhab_keypass"
_debug _openhab_restart "$_openhab_restart"
# Take a backup of the old keystore # Take a backup of the old keystore
_debug "Storing a backup of the existing keystore at ${_openhab_keystore}.bak"
cp "${_openhab_keystore}" "${_openhab_keystore}.bak" cp "${_openhab_keystore}" "${_openhab_keystore}.bak"
# Verify Dependencies/PreReqs # Verify Dependencies/PreReqs
@ -63,7 +75,7 @@ openhabian_deploy() {
-alias mykey \ -alias mykey \
-deststorepass "$_openhab_keypass" \ -deststorepass "$_openhab_keypass" \
-keystore "$_openhab_keystore"; then -keystore "$_openhab_keystore"; then
_debug "Successfully deleted old key" _info "Successfully deleted old key"
else else
_err "Error deleting old key" _err "Error deleting old key"
_err "Please re-run with --debug and report a bug." _err "Please re-run with --debug and report a bug."
@ -81,7 +93,7 @@ openhabian_deploy() {
-deststoretype jks \ -deststoretype jks \
-deststorepass "$_openhab_keypass" \ -deststorepass "$_openhab_keypass" \
-destalias mykey; then -destalias mykey; then
_debug "Successfully imported key" _info "Successfully imported new key"
else else
_err "Failure when importing key" _err "Failure when importing key"
_err "Please re-run with --debug and report a bug." _err "Please re-run with --debug and report a bug."
@ -89,9 +101,19 @@ openhabian_deploy() {
return 1 return 1
fi fi
# TODO: Reload/restart openhab to pick up new key # Reload openhab service
# Unifi script passes a reload cmd to handle reloading. if eval "$_openhab_restart"; then
# Consider also stopping openhab before touching the keystore _info "Restarted opehnab"
else
_err "Failed to restart openhab, please restart openhab manually."
_err "The new key has been installed, but openhab may not use it until restarted"
_err "To prevent this error, override the restart command with DEPLOY_OPENHABIAN_RESTART \
and ensure it can be called by the acme.sh user"
fi
_savedeployconf DEPLOY_OPENHABIAN_KEYSTORE "$DEPLOY_OPENHABIAN_KEYSTORE"
_savedeployconf DEPLOY_OPENHABIAN_KEYPASS "$DEPLOY_OPENHABIAN_KEYPASS"
_savedeployconf DEPLOY_OPENHABIAN_RESTART "$DEPLOY_OPENHABIAN_RESTART"
rm "$_new_pkcs12" rm "$_new_pkcs12"
} }