mirrors/vm
2
0
Fork 0
mirror of https://github.com/nextcloud/vm.git synced 2025-10-26 11:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve letsencryptrenew crontab (#1905)

Browse Source 
Signed-off-by: szaimen <szaimen@e.mail.de>
This commit is contained in:
szaimen 2021-03-27 18:09:34 +01:00 committed by GitHub
parent 3733577bca
commit c8c6da8796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lets-encrypt/test-new-config.sh
View File

@ -31,8 +31,6 @@ If you need to edit the crontab please type: crontab -u root -e
If you need to edit the script itself, please check: $SCRIPTS/letsencryptrenew.sh
Feel free to contribute to this project: https://goo.gl/3fQD65"
crontab -u root -l | grep -v "$SCRIPTS/letsencryptrenew.sh" | crontab -u root -
crontab -u root -l | { cat; echo "3 */12 * * * $SCRIPTS/letsencryptrenew.sh"; } | crontab -u root -
FQDOMAIN=$(grep -m 1 "ServerName" "/etc/apache2/sites-enabled/$1" | awk '{print $2}')
if [ "$(hostname)" != "$FQDOMAIN" ]
@ -49,28 +47,35 @@ fi
# Set trusted domains
run_script NETWORK trusted
add_crontab_le() {
# shellcheck disable=SC2016
DATE='$(date +%Y-%m-%d_%H:%M)'
# Add crontab
cat << CRONTAB > "$SCRIPTS/letsencryptrenew.sh"
#!/bin/sh
if ! certbot renew --quiet --no-self-upgrade > /var/log/letsencrypt/renew.log 2>&1 ; then
echo "Let's Encrypt FAILED!"--$DATE >> /var/log/letsencrypt/cronjob.log
#!/bin/bash
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
echo '###################################'
DATE=\$(date +%Y-%m-%d_%H:%M)
if ! certbot renew >> /var/log/letsencrypt/cronjob.log 2>&1
then
echo "Let's Encrypt FAILED!--\$DATE" >> /var/log/letsencrypt/cronjob.log
else
echo "Let's Encrypt SUCCESS!"--$DATE >> /var/log/letsencrypt/cronjob.log
echo "Let's Encrypt SUCCESS!--\$DATE" >> /var/log/letsencrypt/cronjob.log
fi
# Check if service is running
if ! pgrep apache2 > /dev/null
then
systemctl start apache2.service
if ! pgrep apache2 > /dev/null
then
# shellcheck source=lib.sh
source /var/scripts/fetch_lib.sh || source <(curl -sL https://raw.githubusercontent.com/nextcloud/vm/master/lib.sh)
notify_admin_gui "Could not start Apache!" "Please report this to $ISSUES!"
fi
fi
CRONTAB
}
add_crontab_le
# Makeletsencryptrenew.sh executable
# Make letsencryptrenew.sh executable
chmod +x $SCRIPTS/letsencryptrenew.sh
# Add cronjob
crontab -u root -l | grep -v "$SCRIPTS/letsencryptrenew.sh" | crontab -u root -
crontab -u root -l | { cat; echo "3 */12 * * * $SCRIPTS/letsencryptrenew.sh"; } | crontab -u root -
# Cleanup
rm -f $SCRIPTS/test-new-config.sh