diff --git a/java-gateway/ol/Dockerfile b/java-gateway/ol/Dockerfile index 7f77bd32e..2005625ed 100644 --- a/java-gateway/ol/Dockerfile +++ b/java-gateway/ol/Dockerfile @@ -71,7 +71,8 @@ RUN set -eux && REPOLIST="ol8_baseos_latest,ol8_appstream" && \ mkdir -p /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ dnf -y history undo last && \ diff --git a/java-gateway/ol/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/ol/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/java-gateway/ol/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/java-gateway/rhel/Dockerfile b/java-gateway/rhel/Dockerfile index 7c5753ffc..f48b8159e 100644 --- a/java-gateway/rhel/Dockerfile +++ b/java-gateway/rhel/Dockerfile @@ -90,7 +90,8 @@ RUN set -eux && INSTALL_PKGS="autoconf \ mkdir -p /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ dnf -y history undo last && \ diff --git a/java-gateway/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/java-gateway/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/java-gateway/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - diff --git a/zabbix-appliance/rhel/Dockerfile b/zabbix-appliance/rhel/Dockerfile index 4b71c5e43..15e7a20be 100644 --- a/zabbix-appliance/rhel/Dockerfile +++ b/zabbix-appliance/rhel/Dockerfile @@ -169,7 +169,8 @@ RUN set -eux && REPOLIST="rhel-8-for-x86_64-baseos-rpms,rhel-8-for-x86_64-appstr cp database/mysql/create.sql.gz /usr/share/doc/zabbix-server-mysql/ && \ cp -r src/zabbix_java/bin /usr/sbin/zabbix_java/ && \ cp -r src/zabbix_java/lib /usr/sbin/zabbix_java/ && \ - rm -rf /usr/sbin/zabbix_java/lib/*.xml && \ + rm -rf /usr/sbin/zabbix_java/lib/logback.xml && \ + mv /usr/sbin/zabbix_java/lib/logback-console.xml /etc/zabbix/zabbix_java_gateway_logback.xml && \ cp -R /tmp/zabbix-${ZBX_VERSION}/ui/* /usr/share/zabbix/ && \ cd /tmp/ && \ rm -rf /tmp/zabbix-${ZBX_VERSION}/ && \ diff --git a/zabbix-appliance/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml b/zabbix-appliance/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml deleted file mode 100644 index 750f3506f..000000000 --- a/zabbix-appliance/rhel/conf/etc/zabbix/zabbix_java_gateway_logback.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - -