bero/test
1
0
Fork 0
Code Issues52 Pull Requests3 Actions Packages Projects Releases Wiki Activity

More fixes for plus

Browse Source
This commit is contained in:
root 2025-01-14 19:12:35 +00:00
parent 3c2d853fa4
commit d7b3a653be
2 changed files with 10 additions and 7 deletions

14
lib/functions.sh

@ -101,7 +101,9 @@ EOF
(crontab -l 2>/dev/null; echo "30 22 * * * date >> /federated/logs/backup.log && /federated/bin/backuptool -b all >> /federated/logs/backup.log 2>&1") | sort -u | crontab - (crontab -l 2>/dev/null; echo "30 22 * * * date >> /federated/logs/backup.log && /federated/bin/backuptool -b all >> /federated/logs/backup.log 2>&1") | sort -u | crontab -
(crontab -l 2>/dev/null; echo "0 2 * * * date >> /federated/logs/upgrade.log && /federated/bin/upgrade >> /federated/logs/upgrade.log 2>&1") | sort -u | crontab - (crontab -l 2>/dev/null; echo "0 2 * * * date >> /federated/logs/upgrade.log && /federated/bin/upgrade >> /federated/logs/upgrade.log 2>&1") | sort -u | crontab -
(crontab -l 2>/dev/null; echo "0 3 * * * date >> /federated/logs/dumpcerts.log && /federated/bin/dumpcerts >> /federated/logs/dumpcerts.log 2>&1") | sort -u | crontab - (crontab -l 2>/dev/null; echo "0 3 * * * date >> /federated/logs/dumpcerts.log && /federated/bin/dumpcerts >> /federated/logs/dumpcerts.log 2>&1") | sort -u | crontab -
(crontab -l 2>/dev/null; echo "*/5 * * * * /usr/bin/docker exec -u 33 nextcloud php -f /var/www/html/cron.php") | sort -u | crontab - if [[ "${PLUS}" = "false" ]]; then
(crontab -l 2>/dev/null; echo "*/5 * * * * /usr/bin/docker exec -u 33 nextcloud php -f /var/www/html/cron.php") | sort -u | crontab -
fi
} }
install_federated() { install_federated() {
# Check if Federated is already installed then install # Check if Federated is already installed then install
@ -1769,10 +1771,12 @@ config_network() {
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
} }
run_finishtasks() { run_finishtasks() {
docker exec -u 33 nextcloud php -f /var/www/html/cron.php if [[ "${PLUS}" = "false" ]]; then
docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0 docker exec -u 33 nextcloud php -f /var/www/html/cron.php
docker exec -u 33 nextcloud php -f /var/www/html/cron.php docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0
docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0 docker exec -u 33 nextcloud php -f /var/www/html/cron.php
docker exec -u 33 nextcloud truncate /var/www/html/data/nextcloud.log --size 0
fi
docker system prune -a -f docker system prune -a -f
} }
add_authelia_config_to_dockercompose() { add_authelia_config_to_dockercompose() {

3
lib/listmonk.sh

@ -109,8 +109,7 @@ start_listmonk() {
# Start service with command to make sure it's up before proceeding # Start service with command to make sure it's up before proceeding
start_service "listmonk" "nc -z 192.168.0.21 9000 &> /dev/null" "8" start_service "listmonk" "nc -z 192.168.0.21 9000 &> /dev/null" "8"
docker exec pdns pdnsutil add-record $DOMAIN listmonk A 86400 $EXTERNALIP &> /dev/null [[ "${PLUS}" = "false" ]] && docker exec pdns pdnsutil add-record $DOMAIN listmonk A 86400 $EXTERNALIP &> /dev/null
[ $? -ne 0 ] && fail "Couldn't add dns record"
echo -ne "done." echo -ne "done."
} }