Added OpenSSL package to server and sqlite3 images. Required to perfo…

…rm rehash of added CA certificates
zabbix · Jan 16, 2025 · 4236b6d · 4236b6d
1 parent a6ebccd
commit 4236b6d
Show file tree

Hide file tree

Showing 41 changed files with 66 additions and 0 deletions.
diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile
@@ -51,6 +51,7 @@ RUN set -eux && \
             traceroute \
             nmap \
             iputils \
+            openssl \
             libcap \
             libcurl \
             libevent \

diff --git a/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/alpine/docker-entrypoint.sh
@@ -384,6 +384,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile
@@ -62,6 +62,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             shadow-utils \

diff --git a/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/centos/docker-entrypoint.sh
@@ -381,6 +381,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-mysql/ol/Dockerfile b/Dockerfiles/proxy-mysql/ol/Dockerfile
@@ -62,6 +62,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             zlib \

diff --git a/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ol/docker-entrypoint.sh
@@ -381,6 +381,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile
@@ -77,6 +77,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libcurl-minimal \
             libevent \
             openldap \
+            openssl \
             libssh \
             libxml2 \
             mysql \

diff --git a/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/rhel/docker-entrypoint.sh
@@ -381,6 +381,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@@ -55,6 +55,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
             nmap \
             ca-certificates \
             fping \
+            openssl \
             libcurl4t64 \
             libevent-2.1 \
             libevent-pthreads-2.1 \

diff --git a/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-mysql/ubuntu/docker-entrypoint.sh
@@ -381,6 +381,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
@@ -50,6 +50,7 @@ RUN set -eux && \
             nmap \
             fping \
             iputils \
+            openssl \
             libcap \
             libcurl \
             libevent \

diff --git a/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/alpine/docker-entrypoint.sh
@@ -161,6 +161,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile
@@ -57,6 +57,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             shadow-utils \

diff --git a/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/centos/docker-entrypoint.sh
@@ -161,6 +161,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-sqlite3/ol/Dockerfile b/Dockerfiles/proxy-sqlite3/ol/Dockerfile
@@ -58,6 +58,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             zlib \

diff --git a/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ol/docker-entrypoint.sh
@@ -161,6 +161,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
@@ -75,6 +75,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             libcurl-minimal \
             libevent \
             openldap \
+            openssl \
             libssh \
             libxml2 \
             net-snmp-agent-libs \

diff --git a/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/rhel/docker-entrypoint.sh
@@ -161,6 +161,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
@@ -53,6 +53,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
             nmap \
             ca-certificates \
             fping \
+            openssl \
             libcurl4t64 \
             libevent-2.1 \
             libevent-pthreads-2.1 \

diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/Dockerfiles/proxy-sqlite3/ubuntu/docker-entrypoint.sh
@@ -161,6 +161,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile
@@ -52,6 +52,7 @@ RUN set -eux && \
             nmap \
             tzdata \
             iputils \
+            openssl \
             libcap \
             libcurl \
             libevent \

diff --git a/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/server-mysql/alpine/docker-entrypoint.sh
@@ -400,6 +400,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile
@@ -66,6 +66,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             shadow-utils \

diff --git a/Dockerfiles/server-mysql/centos/docker-entrypoint.sh b/Dockerfiles/server-mysql/centos/docker-entrypoint.sh
@@ -397,6 +397,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-mysql/ol/Dockerfile b/Dockerfiles/server-mysql/ol/Dockerfile
@@ -65,6 +65,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             zlib \

diff --git a/Dockerfiles/server-mysql/ol/docker-entrypoint.sh b/Dockerfiles/server-mysql/ol/docker-entrypoint.sh
@@ -397,6 +397,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile
@@ -75,6 +75,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             shadow-utils \
             iputils \
             hostname \
+            openssl \
             libssh \
             libpsl \
             libbrotli \

diff --git a/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh b/Dockerfiles/server-mysql/rhel/docker-entrypoint.sh
@@ -397,6 +397,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@@ -57,6 +57,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
             iputils-ping \
             traceroute \
             fping \
+            openssl \
             libcurl4t64 \
             libevent-2.1 \
             libevent-pthreads-2.1 \

diff --git a/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-mysql/ubuntu/docker-entrypoint.sh
@@ -397,6 +397,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile
@@ -52,6 +52,7 @@ RUN set -eux && \
             fping \
             tzdata \
             iputils \
+            openssl \
             libcap \
             libcurl \
             libevent \

diff --git a/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
@@ -427,6 +427,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile
@@ -64,6 +64,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             postgresql \

diff --git a/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh b/Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
@@ -427,6 +427,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile
@@ -63,6 +63,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             net-snmp-libs \
             OpenIPMI-libs \
             openldap \
+            openssl \
             openssl-libs \
             pcre2 \
             postgresql \

diff --git a/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
@@ -427,6 +427,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile
@@ -75,6 +75,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
             shadow-utils \
             iputils \
             hostname \
+            openssl \
             libssh \
             libpsl \
             libbrotli \

diff --git a/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh b/Dockerfiles/server-pgsql/rhel/docker-entrypoint.sh
@@ -427,6 +427,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
@@ -57,6 +57,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \
             iputils-ping \
             traceroute \
             fping \
+            openssl \
             libcurl4t64 \
             libevent-2.1 \
             libevent-pthreads-2.1 \

diff --git a/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
@@ -427,6 +427,8 @@ update_zbx_config() {
     else
         export ZBX_ALLOWROOT=1
     fi
+
+    command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
 }
 
 clear_zbx_env() {

diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml
@@ -18,6 +18,9 @@ services:
    - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/certs:/var/lib/zabbix/ssl/certs:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/keys:/var/lib/zabbix/ssl/keys:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/ssl_ca:/var/lib/zabbix/ssl/ssl_ca:rw
    - snmptraps:/var/lib/zabbix/snmptraps:roz
   tmpfs: /tmp
   ulimits:
@@ -171,6 +174,9 @@ services:
    - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/certs:/var/lib/zabbix/ssl/certs:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/keys:/var/lib/zabbix/ssl/keys:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/ssl/ssl_ca:/var/lib/zabbix/ssl/ssl_ca:rw
    - snmptraps:/var/lib/zabbix/snmptraps:ro
   tmpfs: /tmp
   ulimits:
-Original file line number
+Diff line change
@@ Expand Up / @@ -384,6 +384,8 @@ update_zbx_config() { @@
         else
             export ZBX_ALLOWROOT=1
         fi
+        command -v openssl >/dev/null 2>&1 && openssl rehash -v "${ZBX_SSLCALOCATION}" 1>/dev/null
     }
     clear_zbx_env() {
@@ Expand Down @@