diff --git a/install_dehydrated.sh b/install_dehydrated.sh index f0b826c..abd28e5 100755 --- a/install_dehydrated.sh +++ b/install_dehydrated.sh @@ -1476,11 +1476,11 @@ cat << EOF > $DH_CRON_SCRIPT #!/usr/bin/env bash ## ------------------------------------------------------------------------------ -## --- All Configurations will be done in /etc/dehydrated/dehydrated_cronjob.conf +## --- All Configurations will be done in ${DH_CONF_DIR}/dehydrated_cron.conf ## ------------------------------------------------------------------------------ -if [[ -f "/etc/dehydrated/dehydrated_cron.conf" ]]; then - source /etc/dehydrated/dehydrated_cron.conf +if [[ -f "${DH_CONF_DIR}/dehydrated_cron.conf" ]]; then + source ${DH_CONF_DIR}/dehydrated_cron.conf else echo echo -e " [ Error ]: No Configuration File found. Exiting now!" @@ -1793,7 +1793,7 @@ fi # - needed. # - \$verbose && echononl " Register account and agree to their terms of service .." -\$dehydrated_script --register --accept-terms > \$_logfile 2>&1 +\$dehydrated_script --config ${DH_CONF_DIR}/config --register --accept-terms > \$_logfile 2>&1 ret_val=\$? if [[ \$ret_val -eq 0 ]]; then \$verbose && echo_ok @@ -1813,7 +1813,7 @@ else exit 10 fi \$verbose && echononl " Invoking the main dehydrated script for certificate generation.." -\$dehydrated_script -c -g > \$_logfile 2>&1 +\$dehydrated_script --config ${DH_CONF_DIR}/config -c -g > \$_logfile 2>&1 ret_val=\$? if [[ \$ret_val -eq 0 ]]; then _successfully_finished_script=true