diff --git a/type/__recycledcloud_nginx_vhost/files/static.conf.sh b/type/__recycledcloud_nginx_vhost/files/static.conf.sh index c2213b3..363f228 100755 --- a/type/__recycledcloud_nginx_vhost/files/static.conf.sh +++ b/type/__recycledcloud_nginx_vhost/files/static.conf.sh @@ -10,4 +10,4 @@ EOF )" export NGINX_LOGIC -"${__object:?}/files/generic.conf.sh" +"${__type:?}/files/generic.conf.sh" diff --git a/type/__uacme_obtain/manifest b/type/__uacme_obtain/manifest index db4b0ae..59ddce8 100644 --- a/type/__uacme_obtain/manifest +++ b/type/__uacme_obtain/manifest @@ -105,6 +105,9 @@ elif [ -z "$KEY_TARGET" ] && [ -n "$CERT_TARGET" ]; then exit 1 fi +# Make sure challengedir exist. +__directory "$CHALLENGEDIR" --parents + # Generate and deploy renew script. mkdir -p "${__object:?}/files" "${__type:?}/files/renew.sh.sh" > "${__object:?}/files/uacme-renew.sh" @@ -114,5 +117,5 @@ require="__directory/$CONFDIR/$MAIN_DOMAIN" __file "$CONFDIR/$MAIN_DOMAIN/renew. --mode 0755 --source "${__object:?}/files/uacme-renew.sh" # Set up renew cronjob - initial issue done in gencode-remote. -__cron "uacme-$MAIN_DOMAIN" --user root --hour 2 \ +__cron "uacme-$MAIN_DOMAIN" --user root --hour 2 --minute 0 \ --command "$CONFDIR/$MAIN_DOMAIN/renew.sh"