Fix web-server user

This commit is contained in:
Alexey Pustovalov 2026-04-30 18:24:12 +09:00
parent 65538e4c1d
commit b2e6d3fac0
7 changed files with 12 additions and 8 deletions

View file

@ -1,8 +1,5 @@
# shellcheck shell=bash
: "${DAEMON_USER:=apache}"
: "${DAEMON_GROUP:=apache}"
: "${APACHE_RUN_DIR:=/tmp/apache2}"
: "${HTTPD_CONF_FILE:=/etc/apache2/httpd.conf}"

View file

@ -1,7 +1,5 @@
# shellcheck shell=bash
: "${DAEMON_USER:=nginx}"
: "${NGINX_CONF_FILE:=/etc/nginx/nginx.conf}"
: "${NGINX_CONFD_DIR:=/etc/nginx/http.d}"
: "${NGINX_INCLUDES_DIR:=/etc/nginx/includes}"

View file

@ -1,8 +1,5 @@
# shellcheck shell=bash
: "${DAEMON_USER:=nginx}"
: "${DAEMON_GROUP:=nginx}"
# Internal directory for TLS related files, used when TLS*File specified as plain text values
readonly ZABBIX_INTERNAL_ENC_DIR="${ZABBIX_USER_HOME_DIR}/enc_internal"

View file

@ -13,6 +13,9 @@ source "${ENTRYPOINT_LIBS}/web.sh"
: "${ZBX_SERVER_NAME:=Zabbix docker}"
: "${PHP_TZ:=Europe/Riga}"
: "${DAEMON_USER:=apache}"
: "${DAEMON_GROUP:=apache}"
prepare_runtime_commands() {
APACHE_BIN="${APACHE_BIN:-/usr/sbin/httpd}"
PHP_FPM_BIN="${PHP_FPM_BIN:-/usr/sbin/php-fpm}"

View file

@ -13,6 +13,9 @@ source "${ENTRYPOINT_LIBS}/apache.sh"
: "${ZBX_SERVER_NAME:=Zabbix docker}"
: "${PHP_TZ:=Europe/Riga}"
: "${DAEMON_USER:=apache}"
: "${DAEMON_GROUP:=apache}"
prepare_runtime_commands() {
APACHE_BIN="${APACHE_BIN:-/usr/sbin/httpd}"
PHP_FPM_BIN="${PHP_FPM_BIN:-/usr/sbin/php-fpm}"

View file

@ -13,6 +13,9 @@ source "${ENTRYPOINT_LIBS}/nginx.sh"
: "${ZBX_SERVER_NAME:=Zabbix docker}"
: "${PHP_TZ:=Europe/Riga}"
: "${DAEMON_USER:=nginx}"
: "${DAEMON_GROUP:=nginx}"
prepare_runtime_commands() {
NGINX_BIN="${NGINX_BIN:-/usr/sbin/nginx}"
PHP_FPM_BIN="${PHP_FPM_BIN:-/usr/sbin/php-fpm}"

View file

@ -13,6 +13,9 @@ source "${ENTRYPOINT_LIBS}/nginx.sh"
: "${ZBX_SERVER_NAME:=Zabbix docker}"
: "${PHP_TZ:=Europe/Riga}"
: "${DAEMON_USER:=nginx}"
: "${DAEMON_GROUP:=nginx}"
prepare_runtime_commands() {
NGINX_BIN="${NGINX_BIN:-/usr/sbin/nginx}"
PHP_FPM_BIN="${PHP_FPM_BIN:-/usr/sbin/php-fpm}"