safebox/letsencrypt
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor letsencrypt script to improve domain handling and JSON output management
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
gyurix
2025-03-12 23:07:58 +01:00
parent 14a6e628fc
commit 2653583702
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
start.letsencrypt.sh
View File

@@ -41,9 +41,14 @@ sending_error_msg() {
create_json() { create_json() {
LOG=$(cat $LOG_FILE | base64 -w0) LOG=$(cat $LOG_FILE | base64 -w0)
TMP_FILE=$(mktemp) TMP_FILE=$(mktemp)
install -m 664 -g 65534 /dev/null $TMP_FILE jq '
jq 'if . == null or . == [] then [{"'$DOMAIN'":{"date": "'$DATE'", "status": "'$STATUS'", "log": "'$LOG'"}}] else . + [{"'$DOMAIN'":{"date": "'$DATE'", "status": "'$STATUS'", "log": "'$LOG'"}}] end' $LETSENCRYPT_OUTPUT >$TMP_FILE if . == null or . == [] then
mv $TMP_FILE $LETSENCRYPT_OUTPUT [{"'$DOMAIN'":{"date": "'$DATE'", "status": "'$STATUS'", "log": "'$LOG'"}}]
else
(map(select(has("'$DOMAIN'") | not))) + [{"'$DOMAIN'":{"date": "'$DATE'", "status": "'$STATUS'", "log": "'$LOG'"}}]
end
' $LETSENCRYPT_OUTPUT >$TMP_FILE
cat $TMP_FILE >$LETSENCRYPT_OUTPUT
rm $TMP_FILE rm $TMP_FILE
} }
@@ -102,19 +107,27 @@ check_new_cert() {
} }
LETSENCRYPT_FILE=$(find /etc/ssl/keys/ -type f -name letsencrypt) LETSENCRYPT_FILE=$(find /etc/ssl/keys/ -type f -name letsencrypt)
if [ -n "$LETSENCRYPT_FILE" ] || [ "$DOMAIN" != "" ]; then
DOMAIN=$(jq -r .DOMAIN $LETSENCRYPT_FILE)
rm $LETSENCRYPT_FILE
ORIGINAL=$(openssl x509 -in /etc/ssl/keys/$DOMAIN/fullchain.pem -fingerprint -noout)
if [ "$DOMAIN" != "localhost" ]; then if [ "$DOMAIN" != "localhost" ]; then
if [ ! -f $LETSENCRYPT_OUTPUT ]; then if [ ! -f $LETSENCRYPT_OUTPUT ]; then
install -m 664 -g 65534 /dev/null $LETSENCRYPT_OUTPUT install -m 664 -g 65534 /dev/null $LETSENCRYPT_OUTPUT
echo '[]' >$LETSENCRYPT_OUTPUT echo '[]' >$LETSENCRYPT_OUTPUT
fi fi
if [ "$DOMAIN" != "" ]; then
ORIGINAL=$(openssl x509 -in /etc/ssl/keys/$DOMAIN/fullchain.pem -fingerprint -noout)
if [ "$DOMAIN" != "localhost" ]; then
start_letsencrypt start_letsencrypt
check_new_cert check_new_cert
fi fi
elif [ -n "$LETSENCRYPT_FILE" ]; then
DOMAINS=$(jq -r .DOMAIN $LETSENCRYPT_FILE)
for DOMAIN in $(echo $DOMAINS); do
ORIGINAL=$(openssl x509 -in /etc/ssl/keys/$DOMAIN/fullchain.pem -fingerprint -noout)
start_letsencrypt $DOMAIN
check_new_cert
done
else else
cd /domains cd /domains
for i in $(ls); do for i in $(ls); do
@@ -126,3 +139,4 @@ else
fi fi
done done
fi fi
fi