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:
		| @@ -11,6 +11,9 @@ | ||||
| # | ||||
| # Author: Kovács Zoltán <kovacs.zoltan@smartfront.hu> | ||||
| # License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html) | ||||
| # 2025-05-20 v0.3 | ||||
| # fix: The docker itself was missing from the dependency list :(. | ||||
| # fix: Wrong output redirection order (>/dev/null 2>&1 was reversed). | ||||
| # 2024-08-25 v0.2 | ||||
| # new: docker-compose v2 compatibility - tested with Ubuntu 24.04 LTS. | ||||
| # mod: Doesn't do backup if the service is down. | ||||
| @@ -50,7 +53,7 @@ YMLFILE="docker-compose.yml" | ||||
| # | ||||
| TR=$(which tr 2>/dev/null) | ||||
| if [ -z "$TR" ]; then echo "$MSG_MISSINGDEP tr."; exit 1 ; fi | ||||
| for item in cut date dirname git readlink | ||||
| for item in cut date dirname docker git readlink | ||||
| do | ||||
|     if [ -n "$(which $item)" ] | ||||
|     then export $(echo $item | "$TR" '[:lower:]' '[:upper:]')=$(which $item) | ||||
| @@ -70,9 +73,9 @@ while [ -h "$SOURCE" ]; do | ||||
|     # relative to the path where the symlink file was located | ||||
|     [[ $SOURCE != /* ]] && SOURCE="$SCRPATH/$SOURCE" | ||||
| done; SCRPATH="$( cd -P "$("$DIRNAME" "$SOURCE" )" && echo "$PWD" )" #" | ||||
|   | ||||
|  | ||||
| # Let's find which version of docker-compose is installed. | ||||
| 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