From 31572ffa0852eeb9ec88f4480edfcaf207737ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kov=C3=A1cs=20Zolt=C3=A1n?= Date: Tue, 20 May 2025 11:44:31 +0200 Subject: [PATCH] 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 --- .metadata | Bin 15326 -> 15380 bytes .../tools/backup.d/storage_gitbackup.sh | 4 +++- .../tools/backup.d/storage_gitbackup.sh | 9 ++++++--- .templates/.ports | 7 +++++++ .templates/nginx/nginx_static.inc | 2 +- .templates/nginx/nginx_xport.inc | 9 +++++---- tools/backup.d/xport_backup.sh | 4 +++- tools/build | 4 +++- 8 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 .templates/.ports diff --git a/.metadata b/.metadata index 90dc1652372c731e7a84b91d23f099c60a58d871..888c53506d1394b40ded7272b54c7d79ce208277 100644 GIT binary patch delta 230 zcmcatKBZ#ACsr082c3+`g~B3}x!5Xs=48A|X8?jX%~k@FFPe)^4v-Yvyo*hTndhdj zP6kLu;_Nh|$p&(wlP|CcO^g8ZVAVutLh{G3cE$q&`^rFe?< zBxae(^Ef#+vkGQ&u{?JKT6$4ZYIC172S1MwRM{Ekcp;$K=94clv2MPnWy8Ya<^)zJ zJ=s!UkR@>L-So)|MCB*1H)P#hq_4}y;^h4{9pv^&${d^bn^v%}1lR-B2WrSqejv=U JInJtq5da!6NW=gD delta 196 zcmbPIaj$&CCsv+AnWxhjfPnXFBJ1RTtgSrfEN-NO1g3uwm6%*8sXcjtD*xt_Y_iNe zO;DM&R)5tdHz # License: GNU/GPL v3+ (https://www.gnu.org/licenses/gpl-3.0.en.html) +# 2025-05-20 v0.3 +# 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. @@ -72,7 +74,7 @@ while [ -h "$SOURCE" ]; do 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" diff --git a/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh b/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh index e767256..b21b801 100644 --- a/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh +++ b/.recipes/wordpress_mariadb/tools/backup.d/storage_gitbackup.sh @@ -11,6 +11,9 @@ # # Author: Kovács Zoltán # 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" diff --git a/.templates/.ports b/.templates/.ports new file mode 100644 index 0000000..565ba21 --- /dev/null +++ b/.templates/.ports @@ -0,0 +1,7 @@ +# This is a human-readable summary of the port allocation. +# To be maintained manually. You can use it as you like, +# it doesn't matter for docker-skeleton automations. + +8100 ACME for SSL certificates + +8201 diff --git a/.templates/nginx/nginx_static.inc b/.templates/nginx/nginx_static.inc index a4dc51b..0c0a9ad 100644 --- a/.templates/nginx/nginx_static.inc +++ b/.templates/nginx/nginx_static.inc @@ -6,5 +6,5 @@ allow all; autoindex off; index index.html index.htm; - try_files $ri $uri/ =404; + try_files $uri $uri/ =404; } diff --git a/.templates/nginx/nginx_xport.inc b/.templates/nginx/nginx_xport.inc index b460c2d..e288543 100644 --- a/.templates/nginx/nginx_xport.inc +++ b/.templates/nginx/nginx_xport.inc @@ -2,10 +2,11 @@ # # Export backups feature. # Needs - # setfacl -m u:www-data:r [...]/configs/xport_backup - # setfacl -m u:www-data:rx [...]/storage/backups - # setfacl -m u:www-data:rx [...]/storage/backups/export - # setfacl -d -m u:www-data:r [...]/storage/backups/export + # setfacl -m u:www-data:r configs/xport_backup + # chmod a-x configs/xport_backup + # setfacl -m u:www-data:rx storage/backups + # setfacl -m u:www-data:rx storage/backups/export + # setfacl -d -m u:www-data:r storage/backups/export # ACLs. location /export { root $PAR_SERVICE/storage/backups; diff --git a/tools/backup.d/xport_backup.sh b/tools/backup.d/xport_backup.sh index 953277d..1391c99 100644 --- a/tools/backup.d/xport_backup.sh +++ b/tools/backup.d/xport_backup.sh @@ -10,6 +10,8 @@ # # Author: Kovács Zoltán # 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. diff --git a/tools/build b/tools/build index 69a6871..4b3367d 100755 --- a/tools/build +++ b/tools/build @@ -8,6 +8,8 @@ # Author: Kovács Zoltán # Kovács Zoltán # 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"