Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Prepare to remove supervisord

Browse source
This commit is contained in:
Alexey Pustovalov 2026-04-16 18:46:32 +09:00
parent 4c4082f050
commit d4463bc473
11 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfiles/web-apache-mysql/ubuntu/Dockerfile
View file

@ -109,7 +109,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
/var/lib/php/session \
/var/lib/locales/supported.d && \
rm -rf /etc/apache2/sites-available/* \
/etc/apache2/sites-enabled/* \
${APACHE_SITES_DIR}/*.conf \
/etc/php/8.3/fpm/pool.d/www.conf \
/var/run/apache2/ \
/var/lib/locales/supported.d/local && \

2
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes.conf
View file

@ -2,4 +2,4 @@ IncludeOptional /etc/apache2/modules.conf
IncludeOptional /etc/apache2/mods-enabled/mime.conf
IncludeOptional /etc/apache2/sites-enabled/*.conf
IncludeOptional ${APACHE_SITES_DIR}/*.conf

0
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/includes/server-common.inc → Dockerfiles/web-apache-mysql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc
View file

2
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache.conf
View file

@ -1,5 +1,5 @@
Listen 8080
<VirtualHost *:8080>
Include /etc/apache2/includes/server-common.inc
Include ${APACHE_SITES_DIR}/server-common.inc
</VirtualHost>

6
Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_ssl.conf
View file

@ -1,5 +1,5 @@
LoadModule ssl_module modules/mod_ssl.so
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
Listen 8443 https
@ -25,5 +25,5 @@ SSLSessionCacheTimeout 300
Protocols h2 http/1.1
Header always set Strict-Transport-Security "max-age=63072000"
Include /etc/apache2/includes/server-common.inc
Include ${APACHE_SITES_DIR}/server-common.inc
</VirtualHost>

7
Dockerfiles/web-apache-pgsql/alpine/Dockerfile
View file

@ -31,10 +31,13 @@ ENV TERM=xterm \
ZABBIX_USER_HOME_DIR=/var/lib/zabbix \
ZABBIX_WWW_ROOT=/usr/share/zabbix
ENV APACHE_RUN_DIR=/tmp/apache2 \
ENV APACHE_BIN=/usr/sbin/httpd \
PHP_FPM_BIN=/usr/sbin/php-fpm85 \
APACHE_RUN_DIR=/tmp/apache2 \
HTTPD_CONF_FILE=/etc/apache2/httpd.conf \
APACHE_SITES_DIR=/etc/apache2/conf.d \
PHP_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf
PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \
PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \

2
Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile
View file

@ -125,7 +125,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
/var/lib/php/session \
/var/lib/locales/supported.d && \
rm -rf /etc/apache2/sites-available/* \
/etc/apache2/sites-enabled/* \
${APACHE_SITES_DIR}/*.conf \
/etc/php/8.3/fpm/pool.d/www.conf \
/var/run/apache2/ \
/var/lib/locales/supported.d/local && \

2
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes.conf
View file

@ -2,4 +2,4 @@ IncludeOptional /etc/apache2/modules.conf
IncludeOptional /etc/apache2/mods-enabled/mime.conf
IncludeOptional /etc/apache2/sites-enabled/*.conf
IncludeOptional ${APACHE_SITES_DIR}/*.conf

0
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/includes/server-common.inc → Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/apache2/sites-enabled/server-common.inc
View file

2
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf
View file

@ -1,5 +1,5 @@
Listen 8080
<VirtualHost *:8080>
Include /etc/apache2/includes/server-common.inc
Include ${APACHE_SITES_DIR}/server-common.inc
</VirtualHost>

6
Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf
View file

@ -1,5 +1,5 @@
LoadModule ssl_module modules/mod_ssl.so
LoadModule socache_shmcb_module modules/mod_socache_shmcb.so
LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
Listen 8443 https
@ -25,5 +25,5 @@ SSLSessionCacheTimeout 300
Protocols h2 http/1.1
Header always set Strict-Transport-Security "max-age=63072000"
Include /etc/apache2/includes/server-common.inc
Include ${APACHE_SITES_DIR}/server-common.inc
</VirtualHost>