Fixed SSL on Nginx images
This commit is contained in:
parent
75525e6905
commit
f90d815c0e
|
|
@ -52,20 +52,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||
unixODBC-devel \
|
||||
zlib-devel" && \
|
||||
microdnf -y install \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "extras-common" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
--setopt=keepcache=0 \
|
||||
--best \
|
||||
--nodocs epel-release && \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "extras-common" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
--setopt=keepcache=0 \
|
||||
--best \
|
||||
--nodocs \
|
||||
epel-release && \
|
||||
microdnf -y install \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "baseos" \
|
||||
--enablerepo "appstream" \
|
||||
--enablerepo "crb" \
|
||||
--enablerepo="epel" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
--setopt=keepcache=0 \
|
||||
--best \
|
||||
--nodocs ${INSTALL_PKGS} && \
|
||||
--disablerepo "*" \
|
||||
--enablerepo "baseos" \
|
||||
--enablerepo "appstream" \
|
||||
--enablerepo "crb" \
|
||||
--enablerepo="epel" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
--setopt=keepcache=0 \
|
||||
--best \
|
||||
--nodocs \
|
||||
${INSTALL_PKGS} && \
|
||||
go telemetry off
|
||||
|
|
|
|||
|
|
@ -116,6 +116,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
|
|||
--disablerepo="*" \
|
||||
--enablerepo="ubi-10-baseos-rpms" \
|
||||
--setopt=install_weak_deps=0 \
|
||||
--setopt=keepcache=0 \
|
||||
--best \
|
||||
--setopt=tsflags=nodocs \
|
||||
tzdata && \
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ prepare_web_server() {
|
|||
if [ -f "${NGINX_SSL_CONFIG_DIR}/ssl.crt" ] && [ -f "${NGINX_SSL_CONFIG_DIR}/ssl.key" ] \
|
||||
&& [ -f "${NGINX_SSL_CONFIG_DIR}/dhparam.pem" ]; then
|
||||
info "** Enable SSL support for Nginx"
|
||||
if [ -f "${ZABBIX_CONF_DIR}/nginx-ssl.conf" ]; then
|
||||
ln -sfT "${ZABBIX_CONF_DIR}/nginx-ssl.conf" "${NGINX_CONFD_DIR}/nginx-ssl.conf"
|
||||
if [ -f "${ZABBIX_CONF_DIR}/nginx_ssl.conf" ]; then
|
||||
ln -sfT "${ZABBIX_CONF_DIR}/nginx_ssl.conf" "${NGINX_CONFD_DIR}/nginx_ssl.conf"
|
||||
if [ -f "/proc/net/if_inet6" ]; then
|
||||
printf 'listen [::]:8443 ssl;\n' > "${NGINX_INCLUDES_DIR}/listen-ipv6-ssl.conf"
|
||||
printf 'allow ::1;\n' >> "${NGINX_INCLUDES_DIR}/listen-ipv6-ssl.conf"
|
||||
|
|
|
|||
Loading…
Reference in a new issue