Commit d699f426 authored by Markus Frosch's avatar Markus Frosch
Browse files

jessie: Merge systemd changes for 2.10.0

parent 90ff4170
icinga2 (2.10.0-2) icinga-jessie; urgency=medium
* Merge systemd changes for 2.10.0
-- Markus Frosch <markus.frosch@icinga.com> Fri, 12 Oct 2018 10:14:06 +0200
icinga2 (2.10.0-1) icinga-jessie; urgency=medium
* Update to 2.10.0
......
......@@ -8,6 +8,7 @@ Build-Depends: bash-completion,
pkg-config,
debhelper (>= 9),
dh-systemd (>= 1.5),
libsystemd-dev,
flex,
g++ (>= 1.96),
libboost-dev,
......
[Unit]
Description=Icinga host/service/network monitoring system
After=postgresql.service mariadb.service carbon-cache.service mysql.service syslog.target network.target
[Service]
Type=simple
UMask=0007
EnvironmentFile=/usr/lib/icinga2/icinga2
EnvironmentFile=/etc/default/icinga2
ExecStartPre=/usr/lib/icinga2/prepare-dirs /usr/lib/icinga2/icinga2
ExecStart=/usr/sbin/icinga2 daemon -e ${ICINGA2_ERROR_LOG}
ExecReload=/usr/lib/icinga2/safe-reload /usr/lib/icinga2/icinga2
PIDFile=/run/icinga2/icinga2.pid
[Install]
WantedBy=multi-user.target
......@@ -5,3 +5,4 @@ tools/syntax/nano/icinga2.nanorc usr/share/nano
usr/share/icinga2
usr/lib/icinga2/prepare-dirs
usr/lib/icinga2/safe-reload
usr/lib/systemd/system/icinga2.service lib/systemd/system
......@@ -22,6 +22,8 @@ ifneq ($(findstring $(DEB_HOST_ARCH), mipsel),)
LTO_BUILD = -DICINGA2_LTO_BUILD=Off
endif
%:
dh $@ --with systemd --with bash_completion
......@@ -42,12 +44,14 @@ override_dh_auto_configure:
-- \
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-DICINGA2_SYSCONFIGFILE=/etc/default/icinga2 \
-DICINGA2_RUNDIR=/run \
-DICINGA2_USER=nagios \
-DICINGA2_GROUP=nagios \
-DICINGA2_COMMAND_GROUP=www-data \
-DICINGA2_GIT_VERSION_INFO=false \
-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \
-DUSE_SYSTEMD=ON \
$(UNITY_BUILD) \
$(LTO_BUILD)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment