diff --git a/zabbix-agentd.xml b/zabbix-agentd.xml deleted file mode 100644 index e28cb84..0000000 --- a/zabbix-agentd.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Agent - Enables Zabbix Agent for monitoring data collection and sending to a Zabbix server. - - diff --git a/zabbix-java-gateway.xml b/zabbix-java-gateway.xml deleted file mode 100644 index db0c150..0000000 --- a/zabbix-java-gateway.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Java Gateway - Enables Zabbix Java Gateway for JMX monitoring and data collection from Java applications. - - diff --git a/zabbix-proxy.xml b/zabbix-proxy.xml deleted file mode 100644 index 0c95661..0000000 --- a/zabbix-proxy.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Proxy - Enables Zabbix Proxy for data collection from monitored devices and sending to Zabbix server. - - diff --git a/zabbix-server.xml b/zabbix-server.xml deleted file mode 100644 index afe5088..0000000 --- a/zabbix-server.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Zabbix Server - Enables Zabbix Server for processing monitoring data, sending notifications, and visualization. - - diff --git a/zabbix.changes b/zabbix.changes index 400fce8..9841773 100644 --- a/zabbix.changes +++ b/zabbix.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 22 16:11:33 UTC 2024 - Boris Manojlovic + +- remove all firewalld definitions as they are part of firewald package already + ------------------------------------------------------------------- Fri Mar 22 07:49:43 UTC 2024 - Boris Manojlovic diff --git a/zabbix.spec b/zabbix.spec index 11042f5..5341e8d 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -35,10 +35,6 @@ Source3: zabbix-java-gateway.sh Source4: zabbix-logrotate.in Source5: apache2-zabbix.conf Source6: README.SUSE -Source7: zabbix-server.xml -Source8: zabbix-agentd.xml -Source9: zabbix-proxy.xml -Source10: zabbix-java-gateway.xml Source11: zabbix-proxy.service Source12: zabbix-agentd.service Source13: zabbix-server.service @@ -396,11 +392,6 @@ sed -e 's|COMPONENT|proxy|g; s|USER|zabbixs|g' %{SOURCE4} > \ %fdupes %{buildroot} -# install firewalld service files -install -Dm 0644 %{SOURCE7} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-server.xml -install -Dm 0644 %{SOURCE8} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-agentd.xml -install -Dm 0644 %{SOURCE9} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-proxy.xml -install -Dm 0644 %{SOURCE10} %{buildroot}%{_prefix}/lib/firewalld/services/zabbix-java-gateway.xml # install systemd unit files install -Dm 0644 %{SOURCE11} %{buildroot}%{_unitdir}/zabbix_proxy.service install -Dm 0644 %{SOURCE12} %{buildroot}%{_unitdir}/zabbix_agentd.service @@ -555,9 +546,6 @@ fi %files server %doc AUTHORS ChangeLog database/mysql database/oracle database/postgresql database/sqlite3 rn6.0.0.html README-SSL.SUSE -%config %{_prefix}/lib/firewalld/services/zabbix-server.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix_server.conf %{_bindir}/zabbix_get @@ -579,9 +567,6 @@ fi %files proxy %doc README-SSL.SUSE -%config %{_prefix}/lib/firewalld/services/zabbix-proxy.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %{_sbindir}/zabbix_proxy %{_sbindir}/zabbix-proxy %{_sbindir}/rczabbix_proxy @@ -599,9 +584,6 @@ fi %files agent %doc README-SSL.SUSE -%config %{_prefix}/lib/firewalld/services/zabbix-agentd.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{agent_group}) %{_sysconfdir}/zabbix/zabbix_agent*.conf %{_sbindir}/rczabbix_agentd @@ -650,9 +632,6 @@ fi %ghost %{_sysconfdir}/alternatives/zabbix_proxy %files java-gateway -%config %{_prefix}/lib/firewalld/services/zabbix-java-gateway.xml -%dir %{_prefix}/lib/firewalld -%dir %{_prefix}/lib/firewalld/services %dir %{_sysconfdir}/zabbix %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix-java-gateway.conf %config(noreplace) %attr(0640, root, %{server_group}) %{_sysconfdir}/zabbix/zabbix-java-gateway-log.xml