desc update

Author: yuriipavlov

config/crontabs/root

@@ -5,8 +5,8 @@
 # * * * * * - time options, see more https://crontab.guru/
 # flock - lock files are used to determine if a script or application is already running
 # >> - append, > renew log file
-# >>/var/log/cron.log 2>&1 - send output to log
-# >/dev/null 2>&1 - send output to black hole
+# >> /var/log/cron.log 2>&1 - send output to log
+# > /dev/null 2>&1 - send output to black hole
 # 2>&1 redirects the output include both the Standard Error and Standard Out. Look details https://tldp.org/LDP/abs/html/io-redirection.html
 
 # Example
@@ -20,8 +20,6 @@
 # WordPress cron run by system cron
 */30 * * * * docker exec ${APP_NAME}_wordpress flock -n /var/log/wordpress/wp-cron.lck php /var/www/html/wp-cron.php >> /var/log/cron.log 2>&1
 
-# Remove wp-cron log file once a week
-#1 3 * * 2 rm /var/log/cron/wp-cron.log >/dev/null 2>&1
 
 # Backup database and media
 15 3 * * * start-backup.sh daily >> /var/log/cron.log 2>&1

config/nginx/templates/partials/basic_auth_enable.conf.template

@@ -2,7 +2,7 @@
 # Edit .template file to change settings
 
     location ^~ /wp-login.php {
-        auth_basic           "Restricted Area: Look password in .env.secret";
+        auth_basic "Restricted Area";
         auth_basic_user_file /etc/nginx/auth/.wplogin;
 
         include /etc/nginx/conf.d/partials/php.conf;

config/nginx/templates/partials/https.conf.template

@@ -41,6 +41,9 @@ server {
 
     include /etc/nginx/conf.d/partials/logs.conf;
 
+    # Check and include Basic Auth config (15-setup-basic-auth.sh)
+    include /etc/nginx/conf.d/partials/basic_auth_${APP_BA}.conf;
+
     include /etc/nginx/conf.d/partials/wordpress.conf;
 
     include /etc/nginx/conf.d/partials/php.conf;

docker/cron/Dockerfile

@@ -1,3 +1,7 @@
+# Based on https://habr.com/ru/company/redmadrobot/blog/305364/
+# https://github.com/renskiy/cron-docker-image
+# Thanks to renskiy
+
 FROM alpine:3.14
 
 RUN set -ex \

docker/cron/start-backup.sh

@@ -28,17 +28,15 @@ if [ "$MODE" == "weekly" ]; then
 fi
 
 
-
-
-# Create backups directory (if not exist)
-mkdir -p "$BACKUPS_DIR"
-mkdir -p "$BACKUPS_DIR"/"$MODE"
-
 # Check is backup enable
 if [ ! "$APP_WP_BACKUP_ENABLE" ] || [ "$APP_WP_BACKUP_ENABLE" == 0 ]; then
     echo "[Fail] Backup is disabled in .env file"; exit 1;
 fi
 
+# Create backups directory (if not exist)
+mkdir -p "$BACKUPS_DIR"
+mkdir -p "$BACKUPS_DIR"/"$MODE"
+
 # Wait 3 times
 for i in {1..3}
 do
@@ -51,7 +49,6 @@ do
     fi
 done
 
-
 # Make database backup
 docker exec "$DATABASE_CONTAINER" \
   mysqldump -u "$MYSQL_ROOT_USER" --password="$MYSQL_ROOT_PASSWORD" "$MYSQL_DATABASE" \

docker/cron/start-cron.sh

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+# Based on https://habr.com/ru/company/redmadrobot/blog/305364/
+# https://github.com/renskiy/cron-docker-image
+# Thanks to renskiy
+
+# Stop when error
+set -e
+
 # setting user for additional cron jobs
 case $1 in
 -u=*|--user=*)