Brett #6

Merged
chillout2k merged 2 commits from devel into master 2020-03-23 23:19:12 +00:00
Showing only changes of commit 477df11250 - Show all commits

View File

@ -10,7 +10,7 @@ if [ ! -z "${ACME_FQDNS+x}" ]; then
exit 1 exit 1
fi fi
if [ ! -d /secrets/ssl ]; then if [ ! -d /secrets/ssl ]; then
mkdir -p /secrets/ssl install -d -m 775 /secrets/ssl
fi fi
if [ ! -z "${ACME_STAGING_ENABLED+x}" ]; then if [ ! -z "${ACME_STAGING_ENABLED+x}" ]; then
STAGING_URI='CA="https://acme-staging-v02.api.letsencrypt.org/directory"' \ STAGING_URI='CA="https://acme-staging-v02.api.letsencrypt.org/directory"' \
@ -43,15 +43,13 @@ if [ ! -z "${ACME_FQDNS+x}" ]; then
echo "${fqdn}" echo "${fqdn}"
echo "${ONELINE}" "${fqdn} " >> /dehydrated/domains.txt echo "${ONELINE}" "${fqdn} " >> /dehydrated/domains.txt
if [ ! -d "/secrets/ssl/${fqdn}" ]; then if [ ! -d "/secrets/ssl/${fqdn}" ]; then
mkdir -p "/secrets/ssl/${fqdn}" install -d -m 775 "/secrets/ssl/${fqdn}"
fi fi
done done
if [ ! -z "${ONELINE}" ]; then if [ ! -z "${ONELINE}" ]; then
echo "" >> /dehydrated/domains.txt echo "" >> /dehydrated/domains.txt
fi fi
chmod +x /app/zwackl_hook.sh chmod +x /app/zwackl_hook.sh
# chmod +x /dehydrated/renew_certs
# ln -f -s /dehydrated/renew_certs /etc/periodic/daily/renew_certs
if [ -z "$(ls -A /dehydrated/accounts)" ]; then if [ -z "$(ls -A /dehydrated/accounts)" ]; then
cd /dehydrated && /dehydrated/dehydrated --register --accept-terms cd /dehydrated && /dehydrated/dehydrated --register --accept-terms
fi fi
@ -67,6 +65,7 @@ if [ ! -z "${ACME_FQDNS+x}" ]; then
/dehydrated/dehydrated --cron -t dns-01 -k /app/zwackl_hook.sh /dehydrated/dehydrated --cron -t dns-01 -k /app/zwackl_hook.sh
fi fi
export CROND_ENABLE='acme' export CROND_ENABLE='acme'
chmod -R +x /dehydrated/certs
else else
echo "Directory /dehydrated not found!" echo "Directory /dehydrated not found!"
exit 1 exit 1