diff --git a/Dockerfile b/Dockerfile index 54a6652c..b28c0a6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN apk upgrade --no-cache -a && \ FROM --platform="$BUILDPLATFORM" alpine:3.19.1 as crowdsec SHELL ["/bin/ash", "-eo", "pipefail", "-c"] -ARG CSNB_VER=v1.0.7 +ARG CSNB_VER=v1.0.8 WORKDIR /src RUN apk upgrade --no-cache -a && \ diff --git a/backend/package.json b/backend/package.json index 16a25374..c007e1ba 100644 --- a/backend/package.json +++ b/backend/package.json @@ -4,7 +4,7 @@ "description": "A beautiful interface for creating Nginx endpoints", "main": "index.js", "dependencies": { - "@apidevtools/json-schema-ref-parser": "11.1.0", + "@apidevtools/json-schema-ref-parser": "11.5.4", "ajv": "6.12.6", "archiver": "7.0.0", "batchflow": "0.4.0", diff --git a/rootfs/etc/logrotate b/rootfs/etc/logrotate index da60b95c..1074e1ea 100644 --- a/rootfs/etc/logrotate +++ b/rootfs/etc/logrotate @@ -6,7 +6,7 @@ compress sharedscripts postrotate - if [ -f /usr/local/nginx/logs/nginx.pid ]; then nginx -s reload; fi + if [ -s /usr/local/nginx/logs/nginx.pid ]; then nginx -s reload; fi kill "$(pgrep goaccess)" endscript } diff --git a/rootfs/usr/local/bin/launch.sh b/rootfs/usr/local/bin/launch.sh index d81de0d9..3294bc57 100755 --- a/rootfs/usr/local/bin/launch.sh +++ b/rootfs/usr/local/bin/launch.sh @@ -46,7 +46,7 @@ fi if [ "$PHP81" = "true" ]; then PHP_INI_SCAN_DIR=/data/php/81/conf.d php-fpm81 -c /data/php/81 -y /data/php/81/php-fpm.conf -FOR; fi & if [ "$PHP82" = "true" ]; then PHP_INI_SCAN_DIR=/data/php/82/conf.d php-fpm82 -c /data/php/82 -y /data/php/82/php-fpm.conf -FOR; fi & if [ "$PHP83" = "true" ]; then PHP_INI_SCAN_DIR=/data/php/83/conf.d php-fpm83 -c /data/php/83 -y /data/php/83/php-fpm.conf -FOR; fi & -if [ "$LOGROTATE" = "true" ]; then while true; do logrotate --verbose --state /data/etc/logrotate.status /etc/logrotate; sleep 1d; done; fi & +if [ "$LOGROTATE" = "true" ]; then while true; do logrotate --verbose --state /data/etc/logrotate.status /etc/logrotate; sleep 25h; done; fi & # shellcheck disable=SC2086 if [ "$GOA" = "true" ]; then while true; do goaccess --no-global-config --num-tests=0 --tz="$TZ" --date-format="%d/%b/%Y" --time-format="%H:%M:%S" --log-format='[%d:%t %^] %v %h %T "%r" %s %b %b %R %u' --no-ip-validation --addr=127.0.0.1 --port="$GOAIWSP" \ -f /data/nginx/access.log --real-time-html -o /tmp/goa/index.html --persist --restore --db-path=/data/etc/goaccess/data -b /etc/goaccess/browsers.list -b /etc/goaccess/podcast.list $GOACLA; done; fi &