From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 22 Aug 2016 11:31:29 +0000 (+0200)
Subject: Revert "RPM: Add firewalld service"
X-Git-Tag: v2.5.0~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c011c5eaad8884789b57b4600eef4cff1131620;p=icinga2

Revert "RPM: Add firewalld service"

This reverts commit 28e40caed26b12afb46bc291aa8c9fc802cae9a2.

fixes #12495
---

diff --git a/icinga2.spec b/icinga2.spec
index 1cbcfd4fd..0c4c7906f 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -107,13 +107,6 @@ BuildRequires: bison
 BuildRequires: make
 %if 0%{?fedora}
 BuildRequires: wxGTK3-devel
-BuildRequires: firewalld-filesystem
-Requires: firewalld-filesystem
-Requires(post): firewalld-filesystem
-%endif
-%if 0%{?rhel} == 7
-Requires: firewalld
-Requires(post): firewalld
 %endif
 
 %if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
@@ -394,11 +387,6 @@ Categories=GTK;Utility;
 Keywords=Monitoring;" > %{buildroot}%{_datadir}/applications/icinga2-studio.desktop
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} == 7
-mkdir -p %{buildroot}%{_prefix}/lib/firewalld/services
-install -p -m 644 tools/firewalld/%{name}.xml %{buildroot}%{_prefix}/lib/firewalld/services
-%endif
-
 %if "%{_vendor}" == "suse"
 %if 0%{?suse_version} >= 1310
 install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/vim74/syntax/%{name}.vim
@@ -444,14 +432,6 @@ getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /s
 
 %endif #suse/rhel
 
-%if 0%{?fedora}
-%firewalld_reload
-%endif
-%if 0%{?rhel} == 7
-test -f /usr/bin/firewall-cmd && firewall-cmd --reload --quiet || :
-%endif
-
-
 %post common
 # suse
 %if "%{_vendor}" == "suse"
@@ -654,10 +634,6 @@ fi
 %attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}
 %attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd
 
-%if 0%{?fedora} || 0%{?rhel} == 7
-%{_prefix}/lib/firewalld/services/%{name}.xml
-%endif
-
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog
diff --git a/tools/firewalld/icinga2.xml b/tools/firewalld/icinga2.xml
deleted file mode 100644
index eb15d3aa2..000000000
--- a/tools/firewalld/icinga2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-  <short>Icinga2</short>
-  <description>Icinga 2 is an open source monitoring system which checks the availability of your network resources, notifies users of outages, and generates performance data for reporting. Enable this for API, cluster and agent communication.</description>
-  <port protocol="tcp" port="5665"/>
-</service>
-