tyler.durden
/
rpm-icinga2
mirror of https://git.icinga.com/packaging/rpm-icinga2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Icinga 2: addresses some linting errors and adds configuration for validation 

refs #6
This commit is contained in:
Dirk Goetz 2017-12-18 14:08:34 +01:00
parent 93269541a8
commit 9ed1679085
15 changed files with 130 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
icinga2.spec
View File

@ -53,7 +53,7 @@
%endif %endif
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
%define plugindir %{_prefix}/lib/nagios/plugins %define plugindir %{_libexecdir}/nagios/plugins
%define apachename apache2 %define apachename apache2
%define apacheconfdir %{_sysconfdir}/apache2/conf.d %define apacheconfdir %{_sysconfdir}/apache2/conf.d
%define apacheuser wwwrun %define apacheuser wwwrun
@ -74,9 +74,6 @@
%define icinga_user icinga %define icinga_user icinga
%define icinga_group icinga %define icinga_group icinga
%define icingacmd_group icingacmd %define icingacmd_group icingacmd
%define icingaweb2name icingaweb2
%define icingaweb2version 2.0.0
%define logmsg logger -t %{name}/rpm %define logmsg logger -t %{name}/rpm
@ -84,7 +81,7 @@ Summary: Network monitoring application
Name: icinga2 Name: icinga2
Version: 2.8.0 Version: 2.8.0
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
License: GPL-2.0+ License: GPLv2+
URL: https://www.icinga.com/ URL: https://www.icinga.com/
Group: System/Monitoring Group: System/Monitoring
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
@ -400,7 +397,7 @@ done
cd - cd -
# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11 # TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11
#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux #/usr/sbin/hardlink -cv %%{buildroot}%%{_datadir}/selinux
%endif %endif
%if 0%{?fedora} %if 0%{?fedora}
@ -633,16 +630,6 @@ fi
%exclude %{_datadir}/%{name}/include %exclude %{_datadir}/%{name}/include
%{_mandir}/man8/%{name}.8.gz %{_mandir}/man8/%{name}.8.gz
%attr(0750,%{icinga_user},%{icingacmd_group}) %{_localstatedir}/cache/%{name}
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/crash
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives
%attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name}
%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}
%attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd
%files libs %files libs
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md
@ -654,7 +641,6 @@ fi
%files common %files common
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md tools/syntax %doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md tools/syntax
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%{_sysconfdir}/bash_completion.d/%{name} %{_sysconfdir}/bash_completion.d/%{name}
%if 0%{?use_systemd} %if 0%{?use_systemd}
@ -690,6 +676,14 @@ fi
%dir %{_libexecdir}/%{name} %dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/prepare-dirs %{_libexecdir}/%{name}/prepare-dirs
%{_libexecdir}/%{name}/safe-reload %{_libexecdir}/%{name}/safe-reload
%attr(0750,%{icinga_user},%{icingacmd_group}) %{_localstatedir}/cache/%{name}
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/log/%{name}/crash
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat
%attr(0750,%{icinga_user},%{icingacmd_group}) %dir %{_localstatedir}/log/%{name}/compat/archives
%attr(0750,%{icinga_user},%{icinga_group}) %{_localstatedir}/lib/%{name}
%attr(0750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}
%attr(2750,%{icinga_user},%{icingacmd_group}) %ghost %{_rundir}/%{name}/cmd
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name} %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}
%attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata %attr(0770,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/perfdata
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp %attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}/tmp

6
rpmlint/icinga2-bin.conf Normal file
View File

@ -0,0 +1,6 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# Icinga is correct
addFilter("W: spelling-error .* Icinga .*")
# Subpackage is a common term for us
addFilter("W: spelling-error .* subpackage .*")

31
rpmlint/icinga2-common.conf Normal file
View File

@ -0,0 +1,31 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# Subpackage is a common term for us
addFilter("W: spelling-error .* subpackage .*")
# Permissions for icinga
addFilter("W: non-standard-uid .* icinga")
addFilter("W: non-standard-gid .* icinga")
addFilter("W: non-standard-gid .* icingacmd")
# Configuration could possibly contain passwords
addFilter("E: non-readable /etc/icinga2/.*.conf (0)?640(L)?")
addFilter("E: non-readable /etc/icinga2/zones.d/README (0)?640(L)?")
# Because of permissions and configuration considerations all directories owned by icinga:icinga are made 750
addFilter("E: non-standard-dir-perm .* (0)?750(L)?")
addFilter("E: non-standard-dir-perm /run/icinga2/cmd (0)?2750(L)?")
# Because of permissions and configuration considerations all directories owned by icinga:icingacmd are made 770
addFilter("E: non-standard-dir-perm /var/spool/icinga2/perfdata (0)?770(L)?")
# Notification scripts should be changed by user
addFilter("E: executable-marked-as-config-file /etc/icinga2/scripts/.*")
# Project prefers usage of env over the path for supporting multiple distributions, no reason to change this in packaging
addFilter("E: wrong-script-interpreter /etc/icinga2/scripts/.* /usr/bin/env bash")
# Bash-completion should not be changed by user
addFilter("W: non-conffile-in-etc /etc/bash_completion.d/icinga2")
# While placing systemd droplet into /usr/lib/systemd would be better /etc/systemd is considered more understandable for users
addFilter("W: systemd-unit-in-etc /etc/systemd/system/icinga2.service.d.*")
# Logrotate configuration is placed in common instead of the main package because icinga2 is only a metapackage
addFilter("E: incoherent-logrotate-file /etc/logrotate.d/icinga2")
# Feature installation
addFilter("W: dangerous-command-in-%post ln")
addFilter("W: dangerous-command-in-%postun rm")
# Only scripts for initsystem in /usr/lib
addFilter("W: only-non-binary-in-usr-lib")

4
rpmlint/icinga2-debuginfo.conf Normal file
View File

@ -0,0 +1,4 @@
# We decided to include third-party libraries
addFilter("E: incorrect-fsf-address /usr/src/debug/icinga2-.*/third-party/.*")
# Only debug-symbols in /usr/lib
addFilter("W: only-non-binary-in-usr-lib")

4
rpmlint/icinga2-doc.conf Normal file
View File

@ -0,0 +1,4 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# Subpackage is a common term for us
addFilter("W: spelling-error .* subpackage .*")

1
rpmlint/icinga2-ido-mysql.conf Symbolic link
View File

@ -0,0 +1 @@
icinga2-ido.conf

1
rpmlint/icinga2-ido-pgsql.conf Symbolic link
View File

@ -0,0 +1 @@
icinga2-ido.conf

16
rpmlint/icinga2-ido.conf Normal file
View File

@ -0,0 +1,16 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# Icinga is correct
addFilter("W: spelling-error .* Icinga .*")
# Subpackage is a common term for us
addFilter("W: spelling-error .* subpackage .*")
# Permissions for icinga
addFilter("W: non-standard-uid .* icinga")
addFilter("W: non-standard-gid .* icinga")
# File contains passwords
addFilter("E: non-readable /etc/icinga2/features-available/ido-.*.conf (0)?640(L)?")
# Feature installation
addFilter("W: dangerous-command-in-%post ln")
addFilter("W: dangerous-command-in-%postun rm")
# This are runtime libraries and not for devel
addFilter("W: devel-file-in-non-devel-package .*")

8
rpmlint/icinga2-libs.conf Normal file
View File

@ -0,0 +1,8 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# Subpackage is a common term for us
addFilter("W: spelling-error .* subpackage .*")
# This are runtime libraries and not for devel
addFilter("W: devel-file-in-non-devel-package .*")
# We decided to provide a more secure default and configuration file is not in the same package
addFilter("W: crypto-policy-non-compliance-openssl /usr/lib64/icinga2/libbase.so.* SSL_CTX_set_cipher_list")

2
rpmlint/icinga2-selinux.conf Normal file
View File

@ -0,0 +1,2 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")

6
rpmlint/icinga2-spec.conf Normal file
View File

@ -0,0 +1,6 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# This is only for osfamily SUSE
addFilter("W: unversioned-explicit-provides monitoring_daemon")
# This is required for the plugins on distributons which not install in arch dependend path
addFilter("E: hardcoded-library-path in %{_prefix}/lib/")

5
rpmlint/icinga2-studio.conf Normal file
View File

@ -0,0 +1,5 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# No separate documentation provided from upstream
addFilter("W: no-documentation")
addFilter("W: no-manual-page-for-binary icinga-studio")

4
rpmlint/icinga2.conf Normal file
View File

@ -0,0 +1,4 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# It is only a meta-package
addFilter("E: no-binary")

4
rpmlint/nano-icinga2.conf Normal file
View File

@ -0,0 +1,4 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# No separate documentation provided from upstream
addFilter("W: no-documentation")

4
rpmlint/vim-icinga2.conf Normal file
View File

@ -0,0 +1,4 @@
# Groups are no longer used for osfamily RedHat, but we provide those for osfamily SUSE
addFilter("W: non-standard-group .*")
# No separate documentation provided from upstream
addFilter("W: no-documentation")