tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "RPM: Add firewalld service" 

This reverts commit 28e40caed2.

fixes #12495
This commit is contained in:
Gunnar Beutner 2016-08-22 13:31:29 +02:00
parent b8d3bcad6a
commit 4c011c5eaa
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
icinga2.spec
View File

@ -107,13 +107,6 @@ BuildRequires: bison
BuildRequires: make BuildRequires: make
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: wxGTK3-devel BuildRequires: wxGTK3-devel
BuildRequires: firewalld-filesystem
Requires: firewalld-filesystem
Requires(post): firewalld-filesystem
%endif
%if 0%{?rhel} == 7
Requires: firewalld
Requires(post): firewalld
%endif %endif
%if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") %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 Keywords=Monitoring;" > %{buildroot}%{_datadir}/applications/icinga2-studio.desktop
%endif %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 "%{_vendor}" == "suse"
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310
install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/vim74/syntax/%{name}.vim 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 %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 %post common
# suse # suse
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
@ -654,10 +634,6 @@ fi
%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name} %attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}
%attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd %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 %files libs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS ChangeLog

7
tools/firewalld/icinga2.xml
View File

@ -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>