jcgruenhage/docker-dehydrated
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added missing quotation marks, configured dehydrated to run once to register initially

Browse source
This commit is contained in:
jreichmann 2017-12-01 17:32:19 +01:00
parent 7916402f78
commit 7d1f62af77
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
root/etc/periodic/weekly/dehydrated
View file

@ -1,3 +1,4 @@
#!/bin/bash
chown -R ${UID}:${GID} /etc/dehydrated /certs /var/www/dehydrated
su-exec ${UID}:${GID} /dehydrated/dehydrated -c
# Run dehydrated
su-exec ${UID}:${GID} /dehydrated/dehydrated --cron --keep-going

8
root/etc/s6.d/dehydrated/run
View file

@ -1,3 +1,11 @@
#!/bin/sh
s6-svc -O /etc/s6.d/dehydrated
# Set ownership to dehydrated on the relevant folders
chown -R ${UID}:${GID} /etc/dehydrated /certs /var/www/dehydrated
# Register to the CA
su-exec ${UID}:${GID} /dehydrated/dehydrated --register --accept-terms
# Run the weekly script once
/etc/periodic/weekly/dehydrated

11
root/etc/s6.d/setup/run
View file

@ -9,7 +9,7 @@ for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated" "${PWD}" "${SC
fi
done
# At this point, no configuration file exists, so copy the example into /etc/dehydrated
# At this point, if no configuration file exists, copy the example into /etc/dehydrated
if [[ "$CONFIGFILE" == "none" ]]; then
cp /dehydrated/docs/examples/config /etc/dehydrated/config
CONFIGFILE="/etc/dehydrated/config"
@ -19,8 +19,8 @@ fi
case "$ENDPOINT" in
"staging")
# If CA=... is commented, uncomment and set it to staging, if it is set to production, set it to staging
sed -ie 's/#CA=.*$/CA="https:\/\/acme-staging.api.letsencrypt.org\/directory/g' $CONFIGFILE
sed -ie 's/CA=.+acme-v01\.api\..+$/CA="https:\/\/acme-staging.api.letsencrypt.org\/directory/g' $CONFIGFILE
sed -ie 's/#CA=.*$/CA="https:\/\/acme-staging.api.letsencrypt.org\/directory"/g' $CONFIGFILE
sed -ie 's/CA=.+acme-v01\.api\..+$/CA="https:\/\/acme-staging.api.letsencrypt.org\/directory"/g' $CONFIGFILE
# Same procedure for CA_TERMS=...
sed -ie 's/#CA_TERMS=.*$/CA_TERMS="https:\/\/acme-staging.api.letsencrypt.org\/terms"/g' $CONFIGFILE
sed -ie 's/CA_TERMS=.+acme-v01\.api\..+$/CA_TERMS="https:\/\/acme-staging.api.letsencrypt.org\/terms"/g' $CONFIGFILE
@ -28,11 +28,13 @@ case "$ENDPOINT" in
"production")
# If CA=... is commented, uncomment and set to production, if it was set to staging, set it to production
sed -ie 's/#CA=.*$/CA="https:\/\/acme-v01.api.letsencrypt.org\/directory"/g' $CONFIGFILE
sed -ie 's/CA=.+acme-staging\.api\..+$/https:\/\/acme-v01.api.letsencrypt.org\/directory/g' $CONFIGFILE
sed -ie 's/CA=.+acme-staging\.api\..+$/https:\/\/acme-v01.api.letsencrypt.org\/directory"/g' $CONFIGFILE
# Same thing for CA_TERMS=...
sed -ie 's/#CA_TERMS=.*$/CA_TERMS="https:\/\/acme-v01.api.letsencrypt.org\/terms"/g' $CONFIGFILE
sed -ie 's/CA_TERMS=.+acme-staging\.api\..+$/CA_TERMS="https:\/\/acme-v01.api.letsencrypt.org\/terms"/g' $CONFIGFILE
;;
*)
echo "INFO: No endpoint was specifically set, dehydrated will use its default"
;;
esac
@ -51,5 +53,6 @@ case "$CHALLENGE" in
sed -ie 's/CHALLENGETYPE=.+$/CHALLENGETYPE="dns-01"/g' $CONFIGFILE
;;
*)
echo "INFO: No challenge-type was specified, the default from dehydrated will be used"
;;
esac