extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 08:35:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trunk

Browse Source
This commit is contained in:
Alexey Pustovalov
2019-11-01 02:01:29 +02:00
parent b31cd586a8 406f32db80
commit 45f9fa03d8
12 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -630,9 +630,6 @@ prepare_web_server_nginx() {
NGINX_SSL_CONFIG="/etc/ssl/nginx"
PHP_SESSIONS_DIR="/var/lib/php5"
echo "** Disable default vhosts"
rm -f $NGINX_CONFD_DIR/*.conf
echo "** Adding Zabbix virtual host (HTTP)"
if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"