Various bugfixes and minor enhancements
* typo in .templates/nginx/nginx_static.inc * better ACL comment in .templates/nginx/nginx_xport.inc * missing dependency and wrong order in storage_gitbackup (MediaWiki, WordPress) * wrong order in tools/build * pointless warnings in tools/backup.d/xport_backup.sh * new info file introduced: services/.ports
This commit is contained in:
@ -10,6 +10,8 @@
|
||||
#
|
||||
# Author: Kovács Zoltán <kovacsz@marcusconsulting.hu>
|
||||
# License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html)
|
||||
# 2025-04-02 v0.2
|
||||
# fix: Omits all warnings about missing source folder(s).
|
||||
# 2025-03-06 v0.1 Initial release
|
||||
|
||||
# Accepted environment variables and their defaults.
|
||||
@ -92,7 +94,7 @@ do
|
||||
# Selects the appropriate files (which have the "DR" - daily retain - tag).
|
||||
for filename in $((export CLASSES_PATTERN="$CLASSES_PATTERN" \
|
||||
RETAIN_DAYS="$PAR_RETAINDAYS" RETAIN_WEEKS=0 RETAIN_MONTHS=0; \
|
||||
"$ROTATE_FOLDER" --noconf -f "$folder") | \
|
||||
"$ROTATE_FOLDER" --noconf -f "$folder" 2>/dev/null) | \
|
||||
"$GREP" '^DR ' | "$CUT" -d' ' -f2) ""
|
||||
do
|
||||
# Updates the current file.
|
||||
|
@ -8,6 +8,8 @@
|
||||
# Author: Kovács Zoltán <kovacs.zoltan@smartfront.hu>
|
||||
# Kovács Zoltán <kovacsz@marcusconsulting.hu>
|
||||
# License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html)
|
||||
# 2025-03-21 v1.2
|
||||
# fix: wrong output redirection order in docker compose.
|
||||
# 2024-08-24 v1.1
|
||||
# new: docker-compose v2 compatibility - tested with Ubuntu 24.04 LTS.
|
||||
# 2023-06-18 v1.0
|
||||
@ -39,7 +41,7 @@ done
|
||||
#
|
||||
# Let's find which version of docker-compose is installed.
|
||||
commandstring=""
|
||||
if [ $($DOCKER compose version 2>&1 >/dev/null; echo $?) -eq 0 ]; then
|
||||
if [ $($DOCKER compose version >/dev/null 2>&1; echo $?) -eq 0 ]; then
|
||||
# We'll use v2 if it is available.
|
||||
DOCKER_COMPOSE="$DOCKER"
|
||||
commandstring="compose"
|
||||
|
Reference in New Issue
Block a user