diff --git a/rootfs/tmp/etc/php84/php-fpm.conf b/rootfs/tmp/etc/php84/php-fpm.conf index 8b51960..a192fdd 100644 --- a/rootfs/tmp/etc/php84/php-fpm.conf +++ b/rootfs/tmp/etc/php84/php-fpm.conf @@ -13,7 +13,7 @@ group = root listen = /run/php-fpm.sock listen.owner = root listen.group = root -listen.mode = 0660 +listen.mode = 0666 pm = dynamic pm.max_children = 5 pm.start_servers = 2 diff --git a/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh b/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh index 64fda8d..7c510cc 100644 --- a/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh @@ -376,7 +376,7 @@ __post_execute() { ( # commands to execute while :; do - if __pgrep unbound >/dev/null 2>&1; then + if pgrep -x unbound >/dev/null 2>&1; then break else sleep 10 diff --git a/rootfs/usr/local/etc/docker/init.d/99-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/99-php-fpm.sh index 9529251..de17100 100644 --- a/rootfs/usr/local/etc/docker/init.d/99-php-fpm.sh +++ b/rootfs/usr/local/etc/docker/init.d/99-php-fpm.sh @@ -124,10 +124,10 @@ SERVICE_UID="0" # set the user id SERVICE_GID="0" # set the group id # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # execute command variables - keep single quotes variables will be expanded later -EXEC_CMD_BIN='php-fpm84' # command to execute -EXEC_CMD_ARGS='--nodaemonize --fpm-config /etc/php84/php-fpm.conf' # command arguments -EXEC_PRE_SCRIPT='' # execute script before -SERVICE_USES_PID='' # Set to no if the service is not running otherwise leave blank +EXEC_CMD_BIN='php-fpm84' # command to execute +EXEC_CMD_ARGS='--nodaemonize --fpm-config /etc/php84/php-fpm.conf --allow-to-run-as-root' # command arguments +EXEC_PRE_SCRIPT='' # execute script before +SERVICE_USES_PID='' # Set to no if the service is not running otherwise leave blank # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Is this service a web server IS_WEB_SERVER="no" diff --git a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh index ad2dc8a..92cd56f 100644 --- a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh @@ -276,7 +276,10 @@ __update_conf_files() { sleep 10 wait_count=$((wait_count + 1)) done - [ $wait_count -ge $max_wait ] && echo "⚠️ Timeout waiting for tor services, continuing anyway" + if [ $wait_count -ge $max_wait ]; then + echo "⚠️ Timeout waiting for tor services, continuing anyway" + return 0 + fi echo "The tor server seems to have started " for site in "/run/tor/sites"/*; do onion_site="$(basename -- $site)"