mirror of https://github.com/Icinga/icinga2.git
Release version 2.7.2
This commit is contained in:
Noah Hilverling
Gunnar Beutner
parent
5c55da88e8
commit
dc925238c0
7
.mailmap
7
.mailmap
|
|
@ -5,9 +5,9 @@ Gunnar Beutner <gunnar.beutner@icinga.com> <icinga@net-icinga2.adm.netways.de>
|
||||||
<michael.friedrich@icinga.com> <michael.friedrich@gmail.com>
|
<michael.friedrich@icinga.com> <michael.friedrich@gmail.com>
|
||||||
<michael.friedrich@icinga.com> <Michael.Friedrich@netways.de>
|
<michael.friedrich@icinga.com> <Michael.Friedrich@netways.de>
|
||||||
<tobias.vonderkrone@profitbricks.com> <tobias@vonderkrone.info>
|
<tobias.vonderkrone@profitbricks.com> <tobias@vonderkrone.info>
|
||||||
Jean-Marcel Flach <jean-marcel.flach@icinga.com> <jean-marcel.flach@netways.de>
|
Jean Flach <jean-marcel.flach@icinga.com> <jean-marcel.flach@netways.de>
|
||||||
Jean-Marcel Flach <jean-marcel.flach@icinga.com> <Crunsher@users.noreply.github.com>
|
Jean Flach <jean-marcel.flach@icinga.com> <Crunsher@users.noreply.github.com>
|
||||||
Jean-Marcel Flach <jean-marcel.flach@icinga.com> Jean Flach <jean-marcel.flach@icinga.com>
|
Jean Flach <jean-marcel.flach@icinga.com> Jean Flach <jean-marcel.flach@icinga.com>
|
||||||
Dolf Schimmel <dolf@transip.nl> <dolf@dolfschimmel.nl>
|
Dolf Schimmel <dolf@transip.nl> <dolf@dolfschimmel.nl>
|
||||||
Markus Waldmüller <markus.waldmueller@netways.de>
|
Markus Waldmüller <markus.waldmueller@netways.de>
|
||||||
Claudio Kuenzler <ck@claudiokuenzler.com>
|
Claudio Kuenzler <ck@claudiokuenzler.com>
|
||||||
|
|
@ -29,3 +29,4 @@ Claudio Kuenzler <ck@claudiokuenzler.com>
|
||||||
<lennart.betz@icinga.com> <lennart.betz@netways.de>
|
<lennart.betz@icinga.com> <lennart.betz@netways.de>
|
||||||
<lars.engels@0x20.net> <lars@0x20.net>
|
<lars.engels@0x20.net> <lars@0x20.net>
|
||||||
Marianne Spiller <github@spiller.me>
|
Marianne Spiller <github@spiller.me>
|
||||||
|
Robin O'Brien <robin@labs.epiuse.com> <robinjohnobrien@gmail.com>
|
||||||
|
|
|
||||||
13
AUTHORS
13
AUTHORS
|
|
@ -39,6 +39,7 @@ David Beck <techiscool@gmail.com>
|
||||||
Denis <zaharden@gmail.com>
|
Denis <zaharden@gmail.com>
|
||||||
Dinesh Majrekar <dinesh.majrekar@serverchoice.com>
|
Dinesh Majrekar <dinesh.majrekar@serverchoice.com>
|
||||||
Dirk Goetz <dirk.goetz@icinga.com>
|
Dirk Goetz <dirk.goetz@icinga.com>
|
||||||
|
Dirk Melchers <dirk@dirk-melchers.de>
|
||||||
Dolf Schimmel <dolf@transip.nl>
|
Dolf Schimmel <dolf@transip.nl>
|
||||||
Edgar Fuß <ef@math.uni-bonn.de>
|
Edgar Fuß <ef@math.uni-bonn.de>
|
||||||
Eduard Güldner <eduard.gueldner@gmail.com>
|
Eduard Güldner <eduard.gueldner@gmail.com>
|
||||||
|
|
@ -62,12 +63,13 @@ Heike Jurzik <icinga@huhnix.org>
|
||||||
Hendrik Röder <hendrik.biz@gmail.com>
|
Hendrik Röder <hendrik.biz@gmail.com>
|
||||||
Ian Kelling <ian@iankelling.org>
|
Ian Kelling <ian@iankelling.org>
|
||||||
Ildar Hizbulin <hizel@vyborg.ru>
|
Ildar Hizbulin <hizel@vyborg.ru>
|
||||||
|
Irina Kaprizkina <ikapriz@gmail.com>
|
||||||
James Pharaoh <james@pharaoh.uk>
|
James Pharaoh <james@pharaoh.uk>
|
||||||
Jan Andres <jan.andres@berenberg.de>
|
Jan Andres <jan.andres@berenberg.de>
|
||||||
Jan Wagner <waja@cyconet.org>
|
Jan Wagner <waja@cyconet.org>
|
||||||
Jason Young <jason.young@velaspan.com>
|
Jason Young <jason.young@velaspan.com>
|
||||||
|
Jean Flach <jean-marcel.flach@icinga.com>
|
||||||
Jean-Louis Dupond <jean-louis@dupond.be>
|
Jean-Louis Dupond <jean-louis@dupond.be>
|
||||||
Jean-Marcel Flach <jean-marcel.flach@icinga.com>
|
|
||||||
Jens Schanz <mail@jensschanz.de>
|
Jens Schanz <mail@jensschanz.de>
|
||||||
Jeremy Armstrong <lepubel@gmail.com>
|
Jeremy Armstrong <lepubel@gmail.com>
|
||||||
Jesse Morgan <morgajel@gmail.com>
|
Jesse Morgan <morgajel@gmail.com>
|
||||||
|
|
@ -108,6 +110,7 @@ Michael <mcktr55@gmail.com>
|
||||||
Michael Friedrich <michael.friedrich@icinga.com>
|
Michael Friedrich <michael.friedrich@icinga.com>
|
||||||
Michael I <mcktr55@gmail.com>
|
Michael I <mcktr55@gmail.com>
|
||||||
Michael Kraus <michael.kraus@consol.de>
|
Michael Kraus <michael.kraus@consol.de>
|
||||||
|
Michael Newton <miken32@gmail.com>
|
||||||
Mikesch-mp <mikesch-mp@koebbes.de>
|
Mikesch-mp <mikesch-mp@koebbes.de>
|
||||||
Mirco Bauer <meebey@meebey.net>
|
Mirco Bauer <meebey@meebey.net>
|
||||||
Mirko Nardin <mirko.nardin@gmx.net>
|
Mirko Nardin <mirko.nardin@gmx.net>
|
||||||
|
|
@ -115,6 +118,8 @@ Nicolai <nbuchwitz@users.noreply.github.com>
|
||||||
Nicolas Limage <github@xephon.org>
|
Nicolas Limage <github@xephon.org>
|
||||||
Nicole Lang <nicole.lang@icinga.com>
|
Nicole Lang <nicole.lang@icinga.com>
|
||||||
Niflou <dubuscyr@gmail.com>
|
Niflou <dubuscyr@gmail.com>
|
||||||
|
Noah Hilverling <noah.hilverling@icinga.com>
|
||||||
|
Noah Hilverling <noah@hilverling.com>
|
||||||
Pall Sigurdsson <palli-github@minor.is>
|
Pall Sigurdsson <palli-github@minor.is>
|
||||||
Patrick Huy <frz@frz.cc>
|
Patrick Huy <frz@frz.cc>
|
||||||
Paul Richards <paul@minimoo.org>
|
Paul Richards <paul@minimoo.org>
|
||||||
|
|
@ -127,8 +132,10 @@ Philipp Dallig <philipp.dallig@gmail.com>
|
||||||
Ralph Breier <ralph.breier@roedl.com>
|
Ralph Breier <ralph.breier@roedl.com>
|
||||||
Reto Zeder <reto.zeder@arcade.ch>
|
Reto Zeder <reto.zeder@arcade.ch>
|
||||||
Ricardo Bartels <ricardo@bitchbrothers.com>
|
Ricardo Bartels <ricardo@bitchbrothers.com>
|
||||||
|
Robin O'Brien <robin@labs.epiuse.com>
|
||||||
Roland Hopferwieser <rhopfer@ica.jku.at>
|
Roland Hopferwieser <rhopfer@ica.jku.at>
|
||||||
Roman Gerhardt <roman.gerhardt@cbc-x.com>
|
Roman Gerhardt <roman.gerhardt@cbc-x.com>
|
||||||
|
Rudy Gevaert <rudy.gevaert@ugent.be>
|
||||||
Rune Darrud <theflyingcorpse@gmail.com>
|
Rune Darrud <theflyingcorpse@gmail.com>
|
||||||
Sam Kottler <shk@linux.com>
|
Sam Kottler <shk@linux.com>
|
||||||
Sebastian Brückner <mail@invlid.com>
|
Sebastian Brückner <mail@invlid.com>
|
||||||
|
|
@ -138,9 +145,11 @@ Simon Murray <spjmurray@yahoo.co.uk>
|
||||||
Simon Ruderich <simon@ruderich.org>
|
Simon Ruderich <simon@ruderich.org>
|
||||||
Siyalrach Anton Thomas <sat@level8.dk>
|
Siyalrach Anton Thomas <sat@level8.dk>
|
||||||
Stefan Triep <stefan@triep.net>
|
Stefan Triep <stefan@triep.net>
|
||||||
|
Stefar77 <Stefar77@users.noreply.github.com>
|
||||||
Stephan Platz <github@paalsteek.de>
|
Stephan Platz <github@paalsteek.de>
|
||||||
Stephan Tesch <stephan@tesch.cx>
|
Stephan Tesch <stephan@tesch.cx>
|
||||||
Steve McMaster <mcmaster@hurricanelabs.com>
|
Steve McMaster <mcmaster@hurricanelabs.com>
|
||||||
|
Strajan Sebastian Ioan <strajan.sebastian@yahoo.com>
|
||||||
Thomas Gelf <thomas@gelf.net>
|
Thomas Gelf <thomas@gelf.net>
|
||||||
Thomas Niedermeier <tniedermeier@thomas-krenn.com>
|
Thomas Niedermeier <tniedermeier@thomas-krenn.com>
|
||||||
Thomas Widhalm <thomas.widhalm@icinga.com>
|
Thomas Widhalm <thomas.widhalm@icinga.com>
|
||||||
|
|
@ -160,10 +169,12 @@ Yannick Charton <tontonitch-pro@yahoo.fr>
|
||||||
Yohan Jarosz <yohanjarosz@yahoo.fr>
|
Yohan Jarosz <yohanjarosz@yahoo.fr>
|
||||||
Zachary McGibbon <zachary.mcgibbon@gmail.com>
|
Zachary McGibbon <zachary.mcgibbon@gmail.com>
|
||||||
Zoltan Nagy <abesto@abesto.net>
|
Zoltan Nagy <abesto@abesto.net>
|
||||||
|
bascarsija <bascarsija.dev@gmail.com>
|
||||||
ctrlaltca <ctrlaltca@gmail.com>
|
ctrlaltca <ctrlaltca@gmail.com>
|
||||||
gitmopp <mopp@gmx.net>
|
gitmopp <mopp@gmx.net>
|
||||||
krishna <gskrishna44@gmail.com>
|
krishna <gskrishna44@gmail.com>
|
||||||
mcktr <mcktr55@gmail.com>
|
mcktr <mcktr55@gmail.com>
|
||||||
mocruz <mocruz@theworkshop.com>
|
mocruz <mocruz@theworkshop.com>
|
||||||
pv2b <pvz@pvz.pp.se>
|
pv2b <pvz@pvz.pp.se>
|
||||||
|
ryanohnemus <ryan.ohnemus@tradingtechnologies.com>
|
||||||
Élie Bouttier <elie@bouttier.eu>
|
Élie Bouttier <elie@bouttier.eu>
|
||||||
|
|
|
||||||
37
CHANGELOG.md
37
CHANGELOG.md
|
|
@ -1,5 +1,28 @@
|
||||||
# Icinga 2.x CHANGELOG
|
# Icinga 2.x CHANGELOG
|
||||||
|
|
||||||
|
## 2.7.2 (2017-11-09)
|
||||||
|
|
||||||
|
### Notes
|
||||||
|
|
||||||
|
* Fixed invalid attribute names in the systemd unit file
|
||||||
|
* Fixed incorrect unique constraint for IDO DB
|
||||||
|
* Moved spec file to the icinga-packaging Git repository
|
||||||
|
* Documentation updates
|
||||||
|
|
||||||
|
### Enhancement
|
||||||
|
|
||||||
|
* [#5736](https://github.com/icinga/icinga2/issues/5736) (Packages): Remove spec file
|
||||||
|
* [#5632](https://github.com/icinga/icinga2/issues/5632) (Documentation): Docs: Mention SELinux in Getting Started chapter
|
||||||
|
|
||||||
|
### Bug
|
||||||
|
|
||||||
|
* [#5653](https://github.com/icinga/icinga2/issues/5653) (Documentation): Docs: Fix default value for `snmp\_nocrypt` for Manubulon CheckCommand definitions
|
||||||
|
* [#5652](https://github.com/icinga/icinga2/issues/5652) (Documentation): Docs: Fix missing default value for cluster-zone checks
|
||||||
|
* [#5636](https://github.com/icinga/icinga2/issues/5636) (DB IDO): Fix unique constraint matching for UPDATE downtime/comment runtime tables in DB IDO
|
||||||
|
* [#5623](https://github.com/icinga/icinga2/issues/5623) (DB IDO): Duplicate Key on MySQL after upgrading to v2.7.1
|
||||||
|
* [#5612](https://github.com/icinga/icinga2/issues/5612) (Documentation, Packages): Improve documentation and systemd config on TaskMax
|
||||||
|
* [#5603](https://github.com/icinga/icinga2/issues/5603) (DB IDO): Icinga 2.7.1 IDO Unique Key Constraint Violation with PostgreSQL
|
||||||
|
|
||||||
## 2.7.1 (2017-09-21)
|
## 2.7.1 (2017-09-21)
|
||||||
|
|
||||||
### Notes
|
### Notes
|
||||||
|
|
@ -55,7 +78,7 @@
|
||||||
* [#5469](https://github.com/icinga/icinga2/issues/5469) (InfluxDB): Failure to connect to InfluxDB increases CPU utilisation by 100% for every failure
|
* [#5469](https://github.com/icinga/icinga2/issues/5469) (InfluxDB): Failure to connect to InfluxDB increases CPU utilisation by 100% for every failure
|
||||||
* [#5466](https://github.com/icinga/icinga2/issues/5466) (DB IDO): DB IDO: Fix host's unreachable state in history tables
|
* [#5466](https://github.com/icinga/icinga2/issues/5466) (DB IDO): DB IDO: Fix host's unreachable state in history tables
|
||||||
* [#5460](https://github.com/icinga/icinga2/issues/5460) (InfluxDB): Icinga 2.7 InfluxdbWriter fails to write metrics to InfluxDB over HTTPS
|
* [#5460](https://github.com/icinga/icinga2/issues/5460) (InfluxDB): Icinga 2.7 InfluxdbWriter fails to write metrics to InfluxDB over HTTPS
|
||||||
* [#5458](https://github.com/icinga/icinga2/issues/5458) (DB IDO): IDO donwtimehistory records orphaned from scheduleddowntime records following restart
|
* [#5458](https://github.com/icinga/icinga2/issues/5458) (DB IDO, needs-feedback): IDO donwtimehistory records orphaned from scheduleddowntime records following restart
|
||||||
* [#5428](https://github.com/icinga/icinga2/issues/5428) (Documentation): "Plugin Check Commands" section inside ITL docs needs adjustments
|
* [#5428](https://github.com/icinga/icinga2/issues/5428) (Documentation): "Plugin Check Commands" section inside ITL docs needs adjustments
|
||||||
* [#5405](https://github.com/icinga/icinga2/issues/5405) (DB IDO): IDO statehistory table does not show hosts going to "UNREACHABLE" state.
|
* [#5405](https://github.com/icinga/icinga2/issues/5405) (DB IDO): IDO statehistory table does not show hosts going to "UNREACHABLE" state.
|
||||||
* [#5392](https://github.com/icinga/icinga2/issues/5392) (Packages): Ensure the cache directory exists
|
* [#5392](https://github.com/icinga/icinga2/issues/5392) (Packages): Ensure the cache directory exists
|
||||||
|
|
@ -150,7 +173,7 @@
|
||||||
* [#1880](https://github.com/icinga/icinga2/issues/1880) (Documentation): add a section for 'monitoring the icinga2 node'
|
* [#1880](https://github.com/icinga/icinga2/issues/1880) (Documentation): add a section for 'monitoring the icinga2 node'
|
||||||
* [#123](https://github.com/icinga/icinga2/issues/123) (ITL): ITL: Update ipmi CheckCommand attributes
|
* [#123](https://github.com/icinga/icinga2/issues/123) (ITL): ITL: Update ipmi CheckCommand attributes
|
||||||
* [#120](https://github.com/icinga/icinga2/issues/120) (ITL): Add new parameter for check\_http: -L: Wrap output in HTML link
|
* [#120](https://github.com/icinga/icinga2/issues/120) (ITL): Add new parameter for check\_http: -L: Wrap output in HTML link
|
||||||
* [#117](https://github.com/icinga/icinga2/issues/117) (ITL): Support --only-critical for check\_apt
|
* [#117](https://github.com/icinga/icinga2/issues/117) (ITL, needs-feedback): Support --only-critical for check\_apt
|
||||||
* [#115](https://github.com/icinga/icinga2/issues/115) (ITL): Inverse Interface Switch for snmp-interface
|
* [#115](https://github.com/icinga/icinga2/issues/115) (ITL): Inverse Interface Switch for snmp-interface
|
||||||
* [#114](https://github.com/icinga/icinga2/issues/114) (ITL): Adding -A to snmp interfaces check
|
* [#114](https://github.com/icinga/icinga2/issues/114) (ITL): Adding -A to snmp interfaces check
|
||||||
|
|
||||||
|
|
@ -188,7 +211,7 @@
|
||||||
* [#5132](https://github.com/icinga/icinga2/issues/5132) (Graphite): GraphiteWriter can slow down Icinga's check result processing
|
* [#5132](https://github.com/icinga/icinga2/issues/5132) (Graphite): GraphiteWriter can slow down Icinga's check result processing
|
||||||
* [#5101](https://github.com/icinga/icinga2/issues/5101) (Packages, Windows): Fix incorrect metadata for the Chocolatey package
|
* [#5101](https://github.com/icinga/icinga2/issues/5101) (Packages, Windows): Fix incorrect metadata for the Chocolatey package
|
||||||
* [#5075](https://github.com/icinga/icinga2/issues/5075) (ITL): fix mitigation for nwc\_health
|
* [#5075](https://github.com/icinga/icinga2/issues/5075) (ITL): fix mitigation for nwc\_health
|
||||||
* [#5062](https://github.com/icinga/icinga2/issues/5062) (Compat): icinga2 checkresults error
|
* [#5062](https://github.com/icinga/icinga2/issues/5062) (Compat, needs-feedback): icinga2 checkresults error
|
||||||
* [#5043](https://github.com/icinga/icinga2/issues/5043) (API): API POST request with 'attrs' as array returns bad\_cast error
|
* [#5043](https://github.com/icinga/icinga2/issues/5043) (API): API POST request with 'attrs' as array returns bad\_cast error
|
||||||
* [#5040](https://github.com/icinga/icinga2/issues/5040) (Cluster): CRL loading fails due to incorrect return code check
|
* [#5040](https://github.com/icinga/icinga2/issues/5040) (Cluster): CRL loading fails due to incorrect return code check
|
||||||
* [#5033](https://github.com/icinga/icinga2/issues/5033) (DB IDO): Flexible downtimes which are not triggered must not update DB IDO's actual\_end\_time in downtimehistory table
|
* [#5033](https://github.com/icinga/icinga2/issues/5033) (DB IDO): Flexible downtimes which are not triggered must not update DB IDO's actual\_end\_time in downtimehistory table
|
||||||
|
|
@ -209,7 +232,7 @@
|
||||||
* [#4778](https://github.com/icinga/icinga2/issues/4778): Fix for traditional glob\(3\) behaviour
|
* [#4778](https://github.com/icinga/icinga2/issues/4778): Fix for traditional glob\(3\) behaviour
|
||||||
* [#4777](https://github.com/icinga/icinga2/issues/4777): NetBSD execvpe.c fix
|
* [#4777](https://github.com/icinga/icinga2/issues/4777): NetBSD execvpe.c fix
|
||||||
* [#4776](https://github.com/icinga/icinga2/issues/4776) (Installation): NetBSD install path fixes
|
* [#4776](https://github.com/icinga/icinga2/issues/4776) (Installation): NetBSD install path fixes
|
||||||
* [#4709](https://github.com/icinga/icinga2/issues/4709) (API): Posting config stage fails on FreeBSD
|
* [#4709](https://github.com/icinga/icinga2/issues/4709) (API, needs-feedback): Posting config stage fails on FreeBSD
|
||||||
* [#4696](https://github.com/icinga/icinga2/issues/4696) (Notifications): Notifications are sent when reloading Icinga 2 even though they're deactivated via modified attributes
|
* [#4696](https://github.com/icinga/icinga2/issues/4696) (Notifications): Notifications are sent when reloading Icinga 2 even though they're deactivated via modified attributes
|
||||||
* [#4666](https://github.com/icinga/icinga2/issues/4666) (Graylog, Performance Data): GelfWriter with enable\_send\_perfdata breaks checks
|
* [#4666](https://github.com/icinga/icinga2/issues/4666) (Graylog, Performance Data): GelfWriter with enable\_send\_perfdata breaks checks
|
||||||
* [#4621](https://github.com/icinga/icinga2/issues/4621) (Configuration, Notifications, Packages): notifications always enabled after update
|
* [#4621](https://github.com/icinga/icinga2/issues/4621) (Configuration, Notifications, Packages): notifications always enabled after update
|
||||||
|
|
@ -254,7 +277,7 @@
|
||||||
* [#5237](https://github.com/icinga/icinga2/issues/5237) (Documentation): Docs: Add a note for Windows debuglog to the troubleshooting chapter
|
* [#5237](https://github.com/icinga/icinga2/issues/5237) (Documentation): Docs: Add a note for Windows debuglog to the troubleshooting chapter
|
||||||
* [#5229](https://github.com/icinga/icinga2/issues/5229) (Installation): CMake: require a GCC version according to INSTALL.md
|
* [#5229](https://github.com/icinga/icinga2/issues/5229) (Installation): CMake: require a GCC version according to INSTALL.md
|
||||||
* [#5227](https://github.com/icinga/icinga2/issues/5227) (Documentation, ITL): feature/itl-vmware-esx-storage-path-standbyok
|
* [#5227](https://github.com/icinga/icinga2/issues/5227) (Documentation, ITL): feature/itl-vmware-esx-storage-path-standbyok
|
||||||
* [#5226](https://github.com/icinga/icinga2/issues/5226) (Packages): RPM spec: don't enable features after an upgrade
|
* [#5226](https://github.com/icinga/icinga2/issues/5226) (needs-feedback, Packages): RPM spec: don't enable features after an upgrade
|
||||||
* [#5225](https://github.com/icinga/icinga2/issues/5225) (DB IDO): Don't call mysql\_error\(\) after a failure of mysql\_init\(\)
|
* [#5225](https://github.com/icinga/icinga2/issues/5225) (DB IDO): Don't call mysql\_error\(\) after a failure of mysql\_init\(\)
|
||||||
* [#5218](https://github.com/icinga/icinga2/issues/5218) (Packages): icinga2.spec: Allow selecting g++ compiler on older SUSE release builds
|
* [#5218](https://github.com/icinga/icinga2/issues/5218) (Packages): icinga2.spec: Allow selecting g++ compiler on older SUSE release builds
|
||||||
* [#5216](https://github.com/icinga/icinga2/issues/5216): Remove "... is is ..." in CONTRIBUTING.md
|
* [#5216](https://github.com/icinga/icinga2/issues/5216): Remove "... is is ..." in CONTRIBUTING.md
|
||||||
|
|
@ -265,14 +288,14 @@
|
||||||
* [#5184](https://github.com/icinga/icinga2/issues/5184) (Documentation): Doc/appendix: fix malformed markdown links
|
* [#5184](https://github.com/icinga/icinga2/issues/5184) (Documentation): Doc/appendix: fix malformed markdown links
|
||||||
* [#5181](https://github.com/icinga/icinga2/issues/5181) (Documentation): List SELinux packages required for building RPMs
|
* [#5181](https://github.com/icinga/icinga2/issues/5181) (Documentation): List SELinux packages required for building RPMs
|
||||||
* [#5178](https://github.com/icinga/icinga2/issues/5178) (Documentation, Windows): Documentation vague on "update-windows" check plugin
|
* [#5178](https://github.com/icinga/icinga2/issues/5178) (Documentation, Windows): Documentation vague on "update-windows" check plugin
|
||||||
* [#5177](https://github.com/icinga/icinga2/issues/5177) (Packages): Issues Packing icinga 2.6.3 tar.gz to RPM
|
* [#5177](https://github.com/icinga/icinga2/issues/5177) (needs-feedback, Packages): Issues Packing icinga 2.6.3 tar.gz to RPM
|
||||||
* [#5175](https://github.com/icinga/icinga2/issues/5175) (Documentation): Add a note about flapping problems to the docs
|
* [#5175](https://github.com/icinga/icinga2/issues/5175) (Documentation): Add a note about flapping problems to the docs
|
||||||
* [#5174](https://github.com/icinga/icinga2/issues/5174) (Documentation): Add missing object type to Apply Rules doc example
|
* [#5174](https://github.com/icinga/icinga2/issues/5174) (Documentation): Add missing object type to Apply Rules doc example
|
||||||
* [#5173](https://github.com/icinga/icinga2/issues/5173) (Documentation): Object type missing from ping Service example in docs
|
* [#5173](https://github.com/icinga/icinga2/issues/5173) (Documentation): Object type missing from ping Service example in docs
|
||||||
* [#5166](https://github.com/icinga/icinga2/issues/5166) (API, Documentation): Set zone attribute to no\_user\_modify for API POST requests
|
* [#5166](https://github.com/icinga/icinga2/issues/5166) (API, Documentation): Set zone attribute to no\_user\_modify for API POST requests
|
||||||
* [#5165](https://github.com/icinga/icinga2/issues/5165) (Documentation): Syntax error In Dependencies chapter
|
* [#5165](https://github.com/icinga/icinga2/issues/5165) (Documentation): Syntax error In Dependencies chapter
|
||||||
* [#5161](https://github.com/icinga/icinga2/issues/5161) (Documentation): ITL documentation - disk-windows usage note with % thresholds
|
* [#5161](https://github.com/icinga/icinga2/issues/5161) (Documentation): ITL documentation - disk-windows usage note with % thresholds
|
||||||
* [#5157](https://github.com/icinga/icinga2/issues/5157) (Documentation): "Three Levels with master, Satellites, and Clients" chapter is not clear about client config
|
* [#5157](https://github.com/icinga/icinga2/issues/5157) (Documentation, needs-feedback): "Three Levels with master, Satellites, and Clients" chapter is not clear about client config
|
||||||
* [#5156](https://github.com/icinga/icinga2/issues/5156) (Documentation): Add CONTRIBUTING.md
|
* [#5156](https://github.com/icinga/icinga2/issues/5156) (Documentation): Add CONTRIBUTING.md
|
||||||
* [#5155](https://github.com/icinga/icinga2/issues/5155) (Documentation): 3.5. Apply Rules topic in the docs needs work.
|
* [#5155](https://github.com/icinga/icinga2/issues/5155) (Documentation): 3.5. Apply Rules topic in the docs needs work.
|
||||||
* [#5153](https://github.com/icinga/icinga2/issues/5153) (Packages): Changed dependency of selinux subpackage
|
* [#5153](https://github.com/icinga/icinga2/issues/5153) (Packages): Changed dependency of selinux subpackage
|
||||||
|
|
|
||||||
13
RELEASE.md
13
RELEASE.md
|
|
@ -3,7 +3,7 @@
|
||||||
Specify the release version.
|
Specify the release version.
|
||||||
|
|
||||||
```
|
```
|
||||||
VERSION=2.7.1
|
VERSION=2.7.2
|
||||||
```
|
```
|
||||||
|
|
||||||
## Issues
|
## Issues
|
||||||
|
|
@ -21,16 +21,14 @@ Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
|
||||||
|
|
||||||
```
|
```
|
||||||
git checkout master
|
git checkout master
|
||||||
git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS
|
git log --use-mailmap | grep '^Author:' | cut -f2- -d' ' | sort | uniq > AUTHORS
|
||||||
```
|
```
|
||||||
|
|
||||||
## Version
|
## Version
|
||||||
|
|
||||||
Fetch the latest spec file from the [icinga-packaging](https://github.com/icinga/icinga-packaging)
|
Update the version in the spec file:
|
||||||
repository and verify that the latest version is set.
|
|
||||||
|
|
||||||
```
|
```
|
||||||
wget -O icinga2.spec https://raw.githubusercontent.com/Icinga/icinga-packaging/rpm/snapshot/icinga2/icinga2.spec
|
|
||||||
gsed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
|
gsed -i "s/Version: .*/Version: $VERSION/g" icinga2.spec
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
@ -78,6 +76,11 @@ MF:
|
||||||
git tag -u D14A1F16 -m "Version $VERSION" v$VERSION
|
git tag -u D14A1F16 -m "Version $VERSION" v$VERSION
|
||||||
```
|
```
|
||||||
|
|
||||||
|
NH:
|
||||||
|
|
||||||
|
```
|
||||||
|
git tag -u 630F89D9 -m "Version $VERSION" v$VERSION
|
||||||
|
```
|
||||||
Push the tag.
|
Push the tag.
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
|
||||||
804
icinga2.spec
804
icinga2.spec
|
|
@ -17,805 +17,7 @@
|
||||||
# * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
# * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
|
||||||
# ******************************************************************************/
|
# ******************************************************************************/
|
||||||
|
|
||||||
|
# The spec file was moved to https://github.com/Icinga/icinga-packaging
|
||||||
|
|
||||||
%define revision 1
|
%define revision 1
|
||||||
|
Version: 2.7.2
|
||||||
# make sure that _rundir is working on older systems
|
|
||||||
%if ! %{defined _rundir}
|
|
||||||
%define _rundir %{_localstatedir}/run
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%define _libexecdir %{_prefix}/lib/
|
|
||||||
%define plugindir %{_libdir}/nagios/plugins
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "redhat"
|
|
||||||
%define apachename httpd
|
|
||||||
%define apacheconfdir %{_sysconfdir}/httpd/conf.d
|
|
||||||
%define apacheuser apache
|
|
||||||
%define apachegroup apache
|
|
||||||
%if 0%{?el5}%{?el6}%{?amzn}
|
|
||||||
%define use_systemd 0
|
|
||||||
%if %(uname -m) != "x86_64"
|
|
||||||
%define march_flag -march=i686
|
|
||||||
%endif
|
|
||||||
%else
|
|
||||||
# fedora and el>=7
|
|
||||||
%define use_systemd 1
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%define plugindir %{_prefix}/lib/nagios/plugins
|
|
||||||
%define apachename apache2
|
|
||||||
%define apacheconfdir %{_sysconfdir}/apache2/conf.d
|
|
||||||
%define apacheuser wwwrun
|
|
||||||
%define apachegroup www
|
|
||||||
%if 0%{?suse_version} >= 1310
|
|
||||||
%define use_systemd 1
|
|
||||||
%else
|
|
||||||
%define use_systemd 0
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%define icinga_user icinga
|
|
||||||
%define icinga_group icinga
|
|
||||||
%define icingacmd_group icingacmd
|
|
||||||
%define icingaweb2name icingaweb2
|
|
||||||
%define icingaweb2version 2.0.0
|
|
||||||
|
|
||||||
# DEPRECATED
|
|
||||||
%define icingaclassicconfdir %{_sysconfdir}/icinga
|
|
||||||
|
|
||||||
%define logmsg logger -t %{name}/rpm
|
|
||||||
|
|
||||||
Summary: Network monitoring application
|
|
||||||
Name: icinga2
|
|
||||||
Version: 2.7.1
|
|
||||||
Release: %{revision}%{?dist}
|
|
||||||
License: GPL-2.0+
|
|
||||||
Group: Applications/System
|
|
||||||
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
|
|
||||||
URL: https://www.icinga.com/
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
Requires: %{name}-bin = %{version}-%{release}
|
|
||||||
|
|
||||||
%description
|
|
||||||
Meta package for Icinga 2 Core, DB IDO and Web.
|
|
||||||
|
|
||||||
%package bin
|
|
||||||
Summary: Icinga 2 binaries and libraries
|
|
||||||
Group: Applications/System
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
PreReq: permissions
|
|
||||||
Provides: monitoring_daemon
|
|
||||||
Recommends: monitoring-plugins
|
|
||||||
%if 0%{?suse_version} >= 1310
|
|
||||||
BuildRequires: libyajl-devel
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
BuildRequires: libedit-devel
|
|
||||||
BuildRequires: ncurses-devel
|
|
||||||
%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
|
|
||||||
BuildRequires: gcc48-c++
|
|
||||||
BuildRequires: libstdc++48-devel
|
|
||||||
BuildRequires: libopenssl1-devel
|
|
||||||
%else
|
|
||||||
%if "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
# Requires devtoolset-2 scl
|
|
||||||
BuildRequires: devtoolset-2-gcc-c++
|
|
||||||
BuildRequires: devtoolset-2-libstdc++-devel
|
|
||||||
BuildRequires: devtoolset-2-binutils
|
|
||||||
%define scl_enable scl enable devtoolset-2 --
|
|
||||||
%else
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: libstdc++-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: openssl-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: cmake
|
|
||||||
BuildRequires: flex >= 2.5.35
|
|
||||||
BuildRequires: bison
|
|
||||||
BuildRequires: make
|
|
||||||
%if 0%{?fedora}
|
|
||||||
BuildRequires: wxGTK3-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?build_icinga_org} && "%{_vendor}" == "redhat" && (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
# el5 and el6 require packages.icinga.com
|
|
||||||
BuildRequires: boost153-devel
|
|
||||||
%else
|
|
||||||
%if 0%{?build_icinga_org} && "%{_vendor}" == "suse" && 0%{?suse_version} < 1310
|
|
||||||
# sles 11 sp3 requires packages.icinga.com
|
|
||||||
BuildRequires: boost153-devel
|
|
||||||
%else
|
|
||||||
%if (0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
# Requires EPEL repository
|
|
||||||
BuildRequires: boost148-devel >= 1.48
|
|
||||||
%else
|
|
||||||
BuildRequires: boost-devel >= 1.48
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
BuildRequires: systemd
|
|
||||||
Requires: systemd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
|
||||||
|
|
||||||
%description bin
|
|
||||||
Icinga 2 is a general-purpose network monitoring application.
|
|
||||||
Provides binaries for Icinga 2 Core.
|
|
||||||
|
|
||||||
%package common
|
|
||||||
Summary: Common Icinga 2 configuration
|
|
||||||
Group: Applications/System
|
|
||||||
%if (0%{?amzn} || 0%{?fedora} || 0%{?rhel})
|
|
||||||
Requires(pre): shadow-utils
|
|
||||||
Requires(post): shadow-utils
|
|
||||||
%endif
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
Requires(pre): shadow
|
|
||||||
Requires(post): shadow
|
|
||||||
# Coreutils is added because of autoyast problems reported
|
|
||||||
Requires(pre): coreutils
|
|
||||||
Requires(post): coreutils
|
|
||||||
%if 0%{?suse_version} >= 1200
|
|
||||||
BuildRequires: monitoring-plugins-common
|
|
||||||
Requires: monitoring-plugins-common
|
|
||||||
%else
|
|
||||||
Recommends: monitoring-plugins-common
|
|
||||||
%endif
|
|
||||||
Recommends: logrotate
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description common
|
|
||||||
Provides common directories, uid and gid among Icinga 2 related
|
|
||||||
packages.
|
|
||||||
|
|
||||||
|
|
||||||
%package doc
|
|
||||||
Summary: Documentation for Icinga 2
|
|
||||||
Group: Applications/System
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description doc
|
|
||||||
Provides documentation for Icinga 2.
|
|
||||||
|
|
||||||
|
|
||||||
%package libs
|
|
||||||
Summary: Libraries for Icinga 2
|
|
||||||
Group: Applications/System
|
|
||||||
Requires: %{name}-common = %{version}-%{release}
|
|
||||||
|
|
||||||
%description libs
|
|
||||||
Provides internal libraries for the daemon or studio.
|
|
||||||
|
|
||||||
|
|
||||||
%package ido-mysql
|
|
||||||
Summary: IDO MySQL database backend for Icinga 2
|
|
||||||
Group: Applications/System
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
BuildRequires: libmysqlclient-devel
|
|
||||||
%if 0%{?suse_version} >= 1310
|
|
||||||
BuildRequires: mysql-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%else
|
|
||||||
BuildRequires: mysql-devel
|
|
||||||
%endif #suse
|
|
||||||
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description ido-mysql
|
|
||||||
Icinga 2 IDO mysql database backend. Compatible with Icinga 1.x
|
|
||||||
IDOUtils schema >= 1.12
|
|
||||||
|
|
||||||
|
|
||||||
%package ido-pgsql
|
|
||||||
Summary: IDO PostgreSQL database backend for Icinga 2
|
|
||||||
Group: Applications/System
|
|
||||||
%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
|
|
||||||
BuildRequires: postgresql-devel >= 8.4
|
|
||||||
%else
|
|
||||||
BuildRequires: postgresql-devel
|
|
||||||
%endif
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description ido-pgsql
|
|
||||||
Icinga 2 IDO PostgreSQL database backend. Compatible with Icinga 1.x
|
|
||||||
IDOUtils schema >= 1.12
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%if !(0%{?amzn})
|
|
||||||
|
|
||||||
# DEPRECATED
|
|
||||||
%package classicui-config
|
|
||||||
Summary: Icinga 2 Classic UI Standalone configuration
|
|
||||||
Group: Applications/System
|
|
||||||
BuildRequires: %{apachename}
|
|
||||||
Requires: %{apachename}
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
Recommends: icinga-www
|
|
||||||
# for running logger to log the deprecated warning
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
BuildRequires:util-linux-systemd
|
|
||||||
Requires: util-linux-systemd
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
Provides: icinga-classicui-config
|
|
||||||
Conflicts: icinga-gui-config
|
|
||||||
|
|
||||||
# DEPRECATED
|
|
||||||
%description classicui-config
|
|
||||||
Icinga 1.x Classic UI Standalone configuration with locations
|
|
||||||
for Icinga 2.
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
%global selinux_variants mls targeted
|
|
||||||
%{!?_selinux_policy_version: %global _selinux_policy_version %(sed -e 's,.*selinux-policy-\\([^/]*\\)/.*,\\1,' /usr/share/selinux/devel/policyhelp 2>/dev/null)}
|
|
||||||
%global modulename %{name}
|
|
||||||
|
|
||||||
%package selinux
|
|
||||||
Summary: SELinux policy module supporting icinga2
|
|
||||||
Group: System Environment/Base
|
|
||||||
BuildRequires: checkpolicy, selinux-policy-devel, /usr/share/selinux/devel/policyhelp, hardlink
|
|
||||||
%if "%{_selinux_policy_version}" != ""
|
|
||||||
Requires: selinux-policy >= %{_selinux_policy_version}
|
|
||||||
%endif
|
|
||||||
Requires: %{name} = %{version}-%{release}
|
|
||||||
Requires(post): policycoreutils-python
|
|
||||||
Requires(postun): policycoreutils-python
|
|
||||||
|
|
||||||
%description selinux
|
|
||||||
SELinux policy module supporting icinga2
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%if 0%{?fedora}
|
|
||||||
%package studio
|
|
||||||
Summary: Studio for Icinga 2
|
|
||||||
Group: Applications/System
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
|
||||||
Requires: wxGTK3
|
|
||||||
|
|
||||||
%description studio
|
|
||||||
Provides a GUI for the Icinga 2 API.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%package -n vim-icinga2
|
|
||||||
Summary: Vim syntax highlighting for icinga2
|
|
||||||
Group: Applications/System
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
BuildRequires: vim
|
|
||||||
Requires: vim
|
|
||||||
%else
|
|
||||||
Requires: vim-filesystem
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description -n vim-icinga2
|
|
||||||
Vim syntax highlighting for icinga2
|
|
||||||
|
|
||||||
|
|
||||||
%package -n nano-icinga2
|
|
||||||
Summary: Nano syntax highlighting for icinga2
|
|
||||||
Group: Applications/System
|
|
||||||
Requires: nano
|
|
||||||
|
|
||||||
%description -n nano-icinga2
|
|
||||||
Nano syntax highlighting for icinga2
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q -n %{name}-%{version}
|
|
||||||
|
|
||||||
%build
|
|
||||||
CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \
|
|
||||||
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
|
|
||||||
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
|
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
|
||||||
-DICINGA2_LTO_BUILD=ON \
|
|
||||||
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
|
||||||
-DBoost_NO_BOOST_CMAKE=ON \
|
|
||||||
-DICINGA2_PLUGINDIR=%{plugindir} \
|
|
||||||
-DICINGA2_RUNDIR=%{_rundir} \
|
|
||||||
-DICINGA2_USER=%{icinga_user} \
|
|
||||||
-DICINGA2_GROUP=%{icinga_group} \
|
|
||||||
-DICINGA2_COMMAND_GROUP=%{icingacmd_group}"
|
|
||||||
%if 0%{?fedora}
|
|
||||||
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_WITH_STUDIO=true"
|
|
||||||
%endif
|
|
||||||
%if "%{_vendor}" == "redhat"
|
|
||||||
%if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6"
|
|
||||||
%if 0%{?build_icinga_org}
|
|
||||||
# Boost_VERSION 1.41.0 vs 101400 - disable build tests
|
|
||||||
# details in https://dev.icinga.com/issues/5033
|
|
||||||
CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=%{_libdir}/boost153 \
|
|
||||||
-DBOOST_INCLUDEDIR=/usr/include/boost153 \
|
|
||||||
-DBoost_ADDITIONAL_VERSIONS='1.53;1.53.0'"
|
|
||||||
%else
|
|
||||||
CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=%{_libdir}/boost148 \
|
|
||||||
-DBOOST_INCLUDEDIR=/usr/include/boost148 \
|
|
||||||
-DBoost_ADDITIONAL_VERSIONS='1.48;1.48.0'"
|
|
||||||
%endif
|
|
||||||
CMAKE_OPTS="$CMAKE_OPTS \
|
|
||||||
-DBoost_NO_SYSTEM_PATHS=TRUE \
|
|
||||||
-DBUILD_TESTING=FALSE \
|
|
||||||
-DBoost_NO_BOOST_CMAKE=TRUE"
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1310
|
|
||||||
CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=%{_libdir}/boost153 \
|
|
||||||
-DBOOST_INCLUDEDIR=/usr/include/boost153 \
|
|
||||||
-DBoost_ADDITIONAL_VERSIONS='1.53;1.53.0' \
|
|
||||||
-DBoost_NO_SYSTEM_PATHS=TRUE \
|
|
||||||
-DBUILD_TESTING=FALSE \
|
|
||||||
-DBoost_NO_BOOST_CMAKE=TRUE"
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
CMAKE_OPTS="$CMAKE_OPTS -DUSE_SYSTEMD=ON"
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
|
|
||||||
# from package gcc48-c++
|
|
||||||
export CC=gcc-4.8
|
|
||||||
export CXX=g++-4.8
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%{?scl_enable} cmake $CMAKE_OPTS -DCMAKE_C_FLAGS:STRING="%{optflags} %{?march_flag}" -DCMAKE_CXX_FLAGS:STRING="%{optflags} %{?march_flag}" .
|
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
cd tools/selinux
|
|
||||||
for selinuxvariant in %{selinux_variants}
|
|
||||||
do
|
|
||||||
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
|
|
||||||
mv %{modulename}.pp %{modulename}.pp.${selinuxvariant}
|
|
||||||
make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
|
|
||||||
done
|
|
||||||
cd -
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%install
|
|
||||||
make install \
|
|
||||||
DESTDIR="%{buildroot}"
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%if !(0%{?amzn})
|
|
||||||
|
|
||||||
# install classicui config
|
|
||||||
install -D -m 0644 etc/icinga/icinga-classic.htpasswd %{buildroot}%{icingaclassicconfdir}/passwd
|
|
||||||
install -D -m 0644 etc/icinga/cgi.cfg %{buildroot}%{icingaclassicconfdir}/cgi.cfg
|
|
||||||
install -D -m 0644 etc/icinga/icinga-classic-apache.conf %{buildroot}%{apacheconfdir}/icinga.conf
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# remove features-enabled symlinks
|
|
||||||
rm -f %{buildroot}/%{_sysconfdir}/%{name}/features-enabled/*.conf
|
|
||||||
|
|
||||||
# enable suse rc links
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
|
|
||||||
%else
|
|
||||||
ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}"
|
|
||||||
%endif
|
|
||||||
mkdir -p "%{buildroot}%{_localstatedir}/adm/fillup-templates/"
|
|
||||||
mv "%{buildroot}%{_sysconfdir}/sysconfig/%{name}" "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}"
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
cd tools/selinux
|
|
||||||
for selinuxvariant in %{selinux_variants}
|
|
||||||
do
|
|
||||||
install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
|
|
||||||
install -p -m 644 %{modulename}.pp.${selinuxvariant} \
|
|
||||||
%{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp
|
|
||||||
done
|
|
||||||
cd -
|
|
||||||
|
|
||||||
# TODO: Fix build problems on Icinga, see https://github.com/Icinga/puppet-icinga_build/issues/11
|
|
||||||
#/usr/sbin/hardlink -cv %{buildroot}%{_datadir}/selinux
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?fedora}
|
|
||||||
mkdir -p "%{buildroot}%{_datadir}/icinga2-studio"
|
|
||||||
install -p -m 644 icinga-studio/icinga.ico %{buildroot}%{_datadir}/icinga2-studio
|
|
||||||
|
|
||||||
mkdir -p "%{buildroot}%{_datadir}/applications"
|
|
||||||
echo "[Desktop Entry]
|
|
||||||
Name=Icinga 2 Studio
|
|
||||||
Comment=API viewer for Icinga 2
|
|
||||||
TryExec=icinga-studio
|
|
||||||
Exec=icinga-studio
|
|
||||||
Icon=/usr/share/icinga2-studio/icinga.ico
|
|
||||||
StartupNotify=true
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Categories=GTK;Utility;
|
|
||||||
Keywords=Monitoring;" > %{buildroot}%{_datadir}/applications/icinga2-studio.desktop
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/site/syntax/%{name}.vim
|
|
||||||
install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/site/ftdetect/%{name}.vim
|
|
||||||
%else
|
|
||||||
install -D -m 0644 tools/syntax/vim/syntax/%{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{name}.vim
|
|
||||||
install -D -m 0644 tools/syntax/vim/ftdetect/%{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim
|
|
||||||
%endif
|
|
||||||
|
|
||||||
install -D -m 0644 tools/syntax/nano/%{name}.nanorc %{buildroot}%{_datadir}/nano/%{name}.nanorc
|
|
||||||
|
|
||||||
%clean
|
|
||||||
[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
|
|
||||||
|
|
||||||
%pre common
|
|
||||||
getent group %{icinga_group} >/dev/null || %{_sbindir}/groupadd -r %{icinga_group}
|
|
||||||
getent group %{icingacmd_group} >/dev/null || %{_sbindir}/groupadd -r %{icingacmd_group}
|
|
||||||
getent passwd %{icinga_user} >/dev/null || %{_sbindir}/useradd -c "icinga" -s /sbin/nologin -r -d %{_localstatedir}/spool/%{name} -G %{icingacmd_group} -g %{icinga_group} %{icinga_user}
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%service_add_pre %{name}.service
|
|
||||||
%endif
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%verifyscript bin
|
|
||||||
%verify_permissions -e %{_rundir}/%{name}/cmd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%post bin
|
|
||||||
|
|
||||||
# suse
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
|
|
||||||
%if 0%{?suse_version} >= 1310
|
|
||||||
%set_permissions %{_rundir}/%{name}/cmd
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%endif #suse/rhel
|
|
||||||
|
|
||||||
%post common
|
|
||||||
# suse
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%fillup_only %{name}
|
|
||||||
%service_add_post %{name}.service
|
|
||||||
%else
|
|
||||||
%fillup_and_insserv %{name}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
if [ ${1:-0} -eq 1 ]
|
|
||||||
then
|
|
||||||
# initial installation, enable default features
|
|
||||||
for feature in checker notification mainlog; do
|
|
||||||
ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%else
|
|
||||||
# rhel
|
|
||||||
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%systemd_post %{name}.service
|
|
||||||
%else
|
|
||||||
/sbin/chkconfig --add %{name}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
if [ ${1:-0} -eq 1 ]
|
|
||||||
then
|
|
||||||
# initial installation, enable default features
|
|
||||||
for feature in checker notification mainlog; do
|
|
||||||
ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%endif
|
|
||||||
# suse/rhel
|
|
||||||
|
|
||||||
%postun common
|
|
||||||
# suse
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%service_del_postun %{name}.service
|
|
||||||
%else
|
|
||||||
%restart_on_update %{name}
|
|
||||||
%insserv_cleanup
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%else
|
|
||||||
# rhel
|
|
||||||
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%systemd_postun_with_restart %{name}.service
|
|
||||||
%else
|
|
||||||
if [ "$1" -ge "1" ]; then
|
|
||||||
/sbin/service %{name} condrestart >/dev/null 2>&1 || :
|
|
||||||
fi
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%endif
|
|
||||||
# suse / rhel
|
|
||||||
|
|
||||||
if [ "$1" = "0" ]; then
|
|
||||||
# deinstallation of the package - remove enabled features
|
|
||||||
rm -rf %{_sysconfdir}/%{name}/features-enabled
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%preun common
|
|
||||||
# suse
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%service_del_preun %{name}.service
|
|
||||||
%else
|
|
||||||
%stop_on_removal %{name}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%else
|
|
||||||
# rhel
|
|
||||||
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%systemd_preun %{name}.service
|
|
||||||
%else
|
|
||||||
if [ "$1" = "0" ]; then
|
|
||||||
/sbin/service %{name} stop > /dev/null 2>&1 || :
|
|
||||||
/sbin/chkconfig --del %{name} || :
|
|
||||||
fi
|
|
||||||
%endif
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%endif
|
|
||||||
# suse / rhel
|
|
||||||
|
|
||||||
%post ido-mysql
|
|
||||||
if [ ${1:-0} -eq 1 ]
|
|
||||||
then
|
|
||||||
# initial installation, enable ido-mysql feature
|
|
||||||
ln -sf ../features-available/ido-mysql.conf %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%postun ido-mysql
|
|
||||||
if [ "$1" = "0" ]; then
|
|
||||||
# deinstallation of the package - remove feature
|
|
||||||
rm -f %{_sysconfdir}/%{name}/features-enabled/ido-mysql.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%post ido-pgsql
|
|
||||||
if [ ${1:-0} -eq 1 ]
|
|
||||||
then
|
|
||||||
# initial installation, enable ido-pgsql feature
|
|
||||||
ln -sf ../features-available/ido-pgsql.conf %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%postun ido-pgsql
|
|
||||||
if [ "$1" = "0" ]; then
|
|
||||||
# deinstallation of the package - remove feature
|
|
||||||
rm -f %{_sysconfdir}/%{name}/features-enabled/ido-pgsql.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%if !(0%{?amzn})
|
|
||||||
|
|
||||||
%post classicui-config
|
|
||||||
if [ ${1:-0} -eq 1 ]
|
|
||||||
then
|
|
||||||
# initial installation, enable features
|
|
||||||
for feature in statusdata compatlog command; do
|
|
||||||
ln -sf ../features-available/${feature}.conf %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
%logmsg "The icinga2-classicui-config package has been deprecated and will be removed in future releases."
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
# DEPRECATED
|
|
||||||
%postun classicui-config
|
|
||||||
if [ "$1" = "0" ]; then
|
|
||||||
# deinstallation of the package - remove feature
|
|
||||||
for feature in statusdata compatlog command; do
|
|
||||||
rm -f %{_sysconfdir}/%{name}/features-enabled/${feature}.conf
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
%post selinux
|
|
||||||
for selinuxvariant in %{selinux_variants}
|
|
||||||
do
|
|
||||||
/usr/sbin/semodule -s ${selinuxvariant} -i \
|
|
||||||
%{_datadir}/selinux/${selinuxvariant}/%{modulename}.pp &> /dev/null || :
|
|
||||||
done
|
|
||||||
/sbin/fixfiles -R icinga2-bin restore &> /dev/null || :
|
|
||||||
/sbin/fixfiles -R icinga2-common restore &> /dev/null || :
|
|
||||||
/sbin/semanage port -a -t icinga2_port_t -p tcp 5665 &> /dev/null || :
|
|
||||||
|
|
||||||
%postun selinux
|
|
||||||
if [ $1 -eq 0 ] ; then
|
|
||||||
/sbin/semanage port -d -t icinga2_port_t -p tcp 5665 &> /dev/null || :
|
|
||||||
for selinuxvariant in %{selinux_variants}
|
|
||||||
do
|
|
||||||
/usr/sbin/semodule -s ${selinuxvariant} -r %{modulename} &> /dev/null || :
|
|
||||||
done
|
|
||||||
/sbin/fixfiles -R icinga2-bin restore &> /dev/null || :
|
|
||||||
/sbin/fixfiles -R icinga2-common restore &> /dev/null || :
|
|
||||||
fi
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc COPYING
|
|
||||||
|
|
||||||
%files bin
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md
|
|
||||||
%{_sbindir}/%{name}
|
|
||||||
%dir %{_libdir}/%{name}/sbin
|
|
||||||
%{_libdir}/%{name}/sbin/%{name}
|
|
||||||
%{plugindir}/check_nscp_api
|
|
||||||
%{_datadir}/%{name}
|
|
||||||
%exclude %{_datadir}/%{name}/include
|
|
||||||
%{_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
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md
|
|
||||||
%exclude %{_libdir}/%{name}/libdb_ido_mysql*
|
|
||||||
%exclude %{_libdir}/%{name}/libdb_ido_pgsql*
|
|
||||||
%dir %{_libdir}/%{name}
|
|
||||||
%{_libdir}/%{name}/*.so*
|
|
||||||
|
|
||||||
%files common
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%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}
|
|
||||||
%{_sysconfdir}/bash_completion.d/%{name}
|
|
||||||
%if 0%{?use_systemd}
|
|
||||||
%attr(644,root,root) %{_unitdir}/%{name}.service
|
|
||||||
%else
|
|
||||||
%attr(755,root,root) %{_sysconfdir}/init.d/%{name}
|
|
||||||
%endif
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%{_sbindir}/rc%{name}
|
|
||||||
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
|
|
||||||
%else
|
|
||||||
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
|
|
||||||
%endif
|
|
||||||
%attr(0750,root,%{icinga_group}) %dir %{_sysconfdir}/%{name}
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/conf.d
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-available
|
|
||||||
%exclude %{_sysconfdir}/%{name}/features-available/ido-*.conf
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/features-enabled
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/scripts
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/repository.d
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_sysconfdir}/%{name}/zones.d
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/%{name}.conf
|
|
||||||
%config(noreplace) %attr(0640,root,%{icinga_group}) %{_sysconfdir}/%{name}/init.conf
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/constants.conf
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.conf
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/conf.d/*.conf
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/*.conf
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/repository.d/*
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/zones.d/*
|
|
||||||
%config(noreplace) %{_sysconfdir}/%{name}/scripts/*
|
|
||||||
%dir %{_libexecdir}/%{name}
|
|
||||||
%{_libexecdir}/%{name}/prepare-dirs
|
|
||||||
%{_libexecdir}/%{name}/safe-reload
|
|
||||||
%attr(0750,%{icinga_user},%{icinga_group}) %dir %{_localstatedir}/spool/%{name}
|
|
||||||
%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 %{_datadir}/%{name}/include
|
|
||||||
%{_datadir}/%{name}/include
|
|
||||||
|
|
||||||
%files doc
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_datadir}/doc/%{name}
|
|
||||||
%docdir %{_datadir}/doc/%{name}
|
|
||||||
|
|
||||||
%files ido-mysql
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-mysql.conf
|
|
||||||
%{_libdir}/%{name}/libdb_ido_mysql*
|
|
||||||
%{_datadir}/icinga2-ido-mysql
|
|
||||||
|
|
||||||
%files ido-pgsql
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%doc COPYING COPYING.Exceptions README.md NEWS AUTHORS CHANGELOG.md
|
|
||||||
%config(noreplace) %attr(0640,%{icinga_user},%{icinga_group}) %{_sysconfdir}/%{name}/features-available/ido-pgsql.conf
|
|
||||||
%{_libdir}/%{name}/libdb_ido_pgsql*
|
|
||||||
%{_datadir}/icinga2-ido-pgsql
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%if !(0%{?amzn})
|
|
||||||
|
|
||||||
%files classicui-config
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%attr(0751,%{icinga_user},%{icinga_group}) %dir %{icingaclassicconfdir}
|
|
||||||
%config(noreplace) %{icingaclassicconfdir}/cgi.cfg
|
|
||||||
%config(noreplace) %{apacheconfdir}/icinga.conf
|
|
||||||
%config(noreplace) %attr(0640,root,%{apachegroup}) %{icingaclassicconfdir}/passwd
|
|
||||||
|
|
||||||
# DEPRECATED, disable builds on Amazon
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{_vendor}" == "redhat" && !(0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" || 0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6")
|
|
||||||
%files selinux
|
|
||||||
%defattr(-,root,root,0755)
|
|
||||||
%doc tools/selinux/*
|
|
||||||
%{_datadir}/selinux/*/%{modulename}.pp
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?fedora}
|
|
||||||
%files studio
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{_bindir}/icinga-studio
|
|
||||||
%{_datadir}/icinga2-studio
|
|
||||||
%{_datadir}/applications/icinga2-studio.desktop
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -n vim-icinga2
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%{_datadir}/vim/site/syntax/%{name}.vim
|
|
||||||
%{_datadir}/vim/site/ftdetect/%{name}.vim
|
|
||||||
%else
|
|
||||||
%{_datadir}/vim/vimfiles/syntax/%{name}.vim
|
|
||||||
%{_datadir}/vim/vimfiles/ftdetect/%{name}.vim
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files -n nano-icinga2
|
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%if "%{_vendor}" == "suse"
|
|
||||||
%dir %{_datadir}/nano
|
|
||||||
%endif
|
|
||||||
%{_datadir}/nano/%{name}.nanorc
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Tue Jun 20 2017 Markus Frosch <markus.frosch@icinga.com> 2.7.0-1
|
|
||||||
- Update to 2.7.0
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue