From b822f9ba49583bb9291c8a2b6032e29bb7df7fd1 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Tue, 28 Apr 2020 23:17:34 +0300
Subject: [PATCH] Updated Ubuntu images

---
 web-apache-mysql/ubuntu/Dockerfile                          | 1 -
 web-apache-pgsql/ubuntu/Dockerfile                          | 1 -
 web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf         | 2 +-
 web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf     | 2 +-
 web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php | 2 +-
 web-nginx-pgsql/ubuntu/Dockerfile                           | 6 ++----
 web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php  | 2 +-
 7 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile
index 394e70a330..1da23fdc29 100644
--- a/web-apache-mysql/ubuntu/Dockerfile
+++ b/web-apache-mysql/ubuntu/Dockerfile
@@ -115,5 +115,4 @@ USER 1997
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
 CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile
index db3619c6fc..94e4c183c3 100644
--- a/web-apache-pgsql/ubuntu/Dockerfile
+++ b/web-apache-pgsql/ubuntu/Dockerfile
@@ -115,5 +115,4 @@ USER 1997
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 
-#CMD ["source", "/etc/apache2/envvars", "&&", "/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
 CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf b/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf
index 2a5aedc309..36def0c29c 100644
--- a/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf
+++ b/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache.conf
@@ -1,4 +1,4 @@
-<VirtualHost *:80>
+<VirtualHost *:8080>
     DocumentRoot /usr/share/zabbix/
     ServerName zabbix
     DirectoryIndex index.php
diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf b/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf
index 798c982dc1..d18d08fded 100644
--- a/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf
+++ b/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_ssl.conf
@@ -3,7 +3,7 @@ LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
 LoadModule headers_module /usr/lib/apache2/modules/mod_headers.so
 
 <IfModule mod_ssl.c>
-    <VirtualHost *:443>
+    <VirtualHost *:8443>
         SSLEngine on
 
         DocumentRoot /usr/share/zabbix/
diff --git a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
index 6cbd68590b..73c991b180 100644
--- a/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
+++ b/web-apache-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
@@ -2,7 +2,7 @@
 // Zabbix GUI configuration file.
 global $DB;
 
-$DB['TYPE']     = 'MYSQL';
+$DB['TYPE']     = 'POSTGRESQL';
 $DB['SERVER']   = '{DB_SERVER_HOST}';
 $DB['PORT']     = '{DB_SERVER_PORT}';
 $DB['DATABASE'] = '{DB_SERVER_DBNAME}';
diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile
index 807024fc76..3044549743 100644
--- a/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/web-nginx-pgsql/ubuntu/Dockerfile
@@ -79,8 +79,7 @@ RUN set -eux && \
     apt-get -y update && \
     DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
             gettext \
-            git \
-            locales && \
+            git && \
     cd /usr/share/ && \
     git clone ${ZBX_SOURCES} --branch ${ZBX_VERSION} --depth 1 --single-branch zabbix-${ZBX_VERSION} && \
     mkdir /usr/share/zabbix/ && \
@@ -111,8 +110,7 @@ RUN set -eux && \
     chmod -R g=u /var/lib/php/session/ && \
     DEBIAN_FRONTEND=noninteractive apt-get -y purge \
             gettext \
-            git \
-            locales && \
+            git && \
     apt-get -y autoremove && \
     apt-get -y clean && \
     rm -rf /var/lib/apt/lists/*
diff --git a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
index 6cbd68590b..73c991b180 100644
--- a/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
+++ b/web-nginx-pgsql/ubuntu/conf/etc/zabbix/web/zabbix.conf.php
@@ -2,7 +2,7 @@
 // Zabbix GUI configuration file.
 global $DB;
 
-$DB['TYPE']     = 'MYSQL';
+$DB['TYPE']     = 'POSTGRESQL';
 $DB['SERVER']   = '{DB_SERVER_HOST}';
 $DB['PORT']     = '{DB_SERVER_PORT}';
 $DB['DATABASE'] = '{DB_SERVER_DBNAME}';