fixing init script, thanks Feandil :D bug 532582

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

6 files changed, 59 insertions, 28 deletions

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index b89f1fa553c5..b9f532bfc6e1 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/icinga2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.17 2014/12/12 16:50:55 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.18 2014/12/14 23:27:21 prometheanfire Exp $
+
+*icinga2-2.2.1-r2 (14 Dec 2014)
+
+  14 Dec 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +files/icinga2-2.2.1-create_var_cache.patch, +icinga2-2.2.1-r2.ebuild,
+  -icinga2-2.2.1-r1.ebuild, files/icinga2.confd, files/icinga2.initd:
+  fixing init script, thanks Feandil :D bug 532582
 
   12 Dec 2014; Matthew Thode <prometheanfire@gentoo.org>
   icinga2-2.2.1-r1.ebuild:
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index f6da749c0519..ccceb47d838d 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -2,30 +2,31 @@
 Hash: SHA256
 
 AUX icinga2-2.1.0-create_var_cache.patch 1191 SHA256 350095704b964473a5584d4dc50f043bb075c5a48bf7a12257ba2dfd778b99dc SHA512 803d6b3ec9b23be3934d022d8c2c3c97c1dfb8d8b0786ee979049df205faffd7001258620b852b56dc1dc06a3c9ce45cc8070007137c92e273d25b1ff8c6f80c WHIRLPOOL 6dce723e209307099fab40e028d8062a56ab94d7c688e814fd3fea8179e824a5f165b0277b318f12de8a627313be0b23ad23ee5272c4f7bbdf8184e926992730
-AUX icinga2.confd 196 SHA256 f2a2573d5ae0d335078183e86b14af804776653f639a4a1c8539580ced895c19 SHA512 e0912ac5dac6d93b720fc83a63321f1245e71a5d4cc5b675680c00b44fcd8346020c387a26477eff69c98683a7e58566d18ff8e9962bad8985b361149f19709f WHIRLPOOL a544174f11c8e1277649cc865c98eca14d9beea69f3d0c8398fb7aa54688a8b025f78f4c0a3f7aef92d4db914661ac166ed8ba531bef20de3d9419a5963cff72
-AUX icinga2.initd 1189 SHA256 f729fef66119a1c81271ec8dca4ad693f75fd839eecbb4f5a9d2c57ca47eacc7 SHA512 341bb598afc4a8c8958dcc920fc51015cfa91d16541d92d5d6e405cbe1cca1245911bdbadf589f2c3dd337f8fa5310f1f0dade3017a0c9d1d3f2128c1fada2ee WHIRLPOOL 70dddb147131754dc33b5e97da8bc7ae983a8cc160349831631e433742f28337a6632fc211f8524a4a306423418623482d2e50e7bb7d58474db2cc4e23a83a48
+AUX icinga2-2.2.1-create_var_cache.patch 415 SHA256 aa6c6667e81a0082f6759b7fc15ce9c2c39c18822931ec7732ddc329125fb703 SHA512 c80345d55985304d23abdf97a4c6fd80105b2e1d33f538c09dcf42b993ac26ef5a995cf3c602a5347906ce937a524b6f8a1e658ee81ff08be3859f4ecf0d26e5 WHIRLPOOL 5b0e1e8c2afcc534f9100896dae13eedc3df2964d153dc9d5932a4a6c4c7996ca8f937ce7e70c804a82185be9b8e8717ac9aadb569c0265c10bd170d4740e69e
+AUX icinga2.confd 135 SHA256 ba821687a15008781a9e5953e66b4290891af4f15736902cb2e78cc8b95ae568 SHA512 f194b7a7d202bc5b8a611722b21a5cf8cf91afda15dc1b1b007050b34fbd7462952268fcb6eddd94e05d474364e7873ae691ccf0049b79c89e48f780b03b0520 WHIRLPOOL baa19b2a4bb4361b1ad093ec019b199fb41a64825cb434a9e2e48ff5eb14e82bf3a09fa0167afa86140a774c6f8fa034f2049881f7b84874f5f24702cc09c97e
+AUX icinga2.initd 1934 SHA256 13310a765e5ac214f17d7d4b426fb44f8d6afa5c3485b8344f6452612e4cbd78 SHA512 736271d3e80e9f325ca354fc4e1f6f41be5526c0b1352dd81a62622186791d882191e13dbf735038c54c61cc98e34f357a11cc09473fcfc4662e16b2c54fc7c9 WHIRLPOOL 5dc1cd616708b271aace167640521a6f9828edf926b171caf90b41fe6f69c57f156b24c03cfb6a43285271cb9427cbc18aaa30ddac132dc40bc1fc53e15342b8
 DIST icinga2-2.0.2.tar.gz 546107 SHA256 b21c4c4bc2152ed3850d34ef3eed03588e508a9080c10f15750e9a115d856ced SHA512 2d754f605dafbcf0290566241d776c20269f13f243ba509ddf33cf86c012e633c78beb226b904b487c6180a1fe6c5e50816e33960f1cba7c3df901649e4f0c7d WHIRLPOOL 0a5e61343a528fd88828a5b1acd2e704554af71eb750cc52dd92fd7c4cc390a752943041a6723d23d5c79dc23b3bcdcb2eeb42047ba226e4e2c905589502b60c
 DIST icinga2-2.1.0.tar.gz 567861 SHA256 6aad43c69385db3463ca0a3f14f7373d03a967451eb976a89955d1c99f9300e6 SHA512 683bd8944eced5036b328ca7f942b43620ba9d2e1ae2c7ad067416b778c693e97d95e082240cb293826b4e6241de9fd2fe97afacd385c5f578e47b821d358a3d WHIRLPOOL f10844592c0ebc41e15346f49ef3760d69980a8b742cae3c2d5b21f5075e2959c60499890d29d7e4893e740c133f09a5202565b6a91223cabaedc6afe88d49cb
 DIST icinga2-2.2.1.tar.gz 683579 SHA256 3daf73b30cfeca6b29c8ca715c006b4e612324165a0583eb072a51d0925eea6d SHA512 0cf80b67129b989fff9c2faf3e7455fe941b30bc48e337ba1a29294974d18e4b0462b2d1b11b8508add2c76340b7044e4575ef3d189bedb4e1a31daf80dfc2d3 WHIRLPOOL 880e13f9e0ce69433342a564c8a5e5f45a513a30334d40a349d8463c263066986205537a62d279b0ef3894c12dd2ff981a7ac6a0667d76b3fc4c4aebf76c1412
 EBUILD icinga2-2.0.2.ebuild 3308 SHA256 414fc9a46d8f4fc3d8431241209e009e3c2bdf427802e76e45459a7d7e7a92f1 SHA512 c4a1013f864c227a9ec2c342ba666106f4c9e2f7d02e787cbf494d36d556d512e42fd0d1a456a7a5d72d096af7ba703e3ed7ba8c072a644ebe923132ad3b27ed WHIRLPOOL c85eac0059e8e8bea6498712633546be3e39d34c6ee203624cb4e08d9b8d8d7a86f9c67176e2648be55764a9d9f757dec3114973605940b0a3c58f5c13f0546f
 EBUILD icinga2-2.1.0-r3.ebuild 4080 SHA256 22d72e85fcd3db0e8525f7c9c19074b6d0a061831b9e00e8beae67b16d0de457 SHA512 2fac2143445e980f2be841acbdc20dc3e8663ee83d5d9bc1e97a943484c8f919de359285f3a769354c55f16293c01f9b3a386f6f589c3de444b712dca29f2b97 WHIRLPOOL d12cdb58547a05513460bfc6c608b79694d20aef1b519cf4f0374e919daef8e0e597b16669b7a3ae4a580b94c1518c28ea7e68ccdcdffe216a22985748f6d90a
-EBUILD icinga2-2.2.1-r1.ebuild 4253 SHA256 0558abf1236c7289b8a386cd00fa5e0087ec6e7c56ce2ce8b713ca36e6b213a0 SHA512 b6d4d7bb0e13dada105ee871b45b6a2d4896c27765ae0de2eaf4d2f69bec58386cb9102b2ccf3db32545f7c9f2da7944e6a1a9586ea0a36b421847751a1966be WHIRLPOOL e7bd52c5a9d494340079c0f163489ea48bbb12d937e806c6173747bc0c637567e6b6a2e8ae57c47daadc31b799f3e7ee34993997c8d1b215cbe814c383c54a7e
-MISC ChangeLog 2838 SHA256 80748d15e7f05ed61b752e044dd1b73545cb3c00f3a0f7524fa80c6297c84124 SHA512 f9b3b8c9aa3b630292fb74daf4afe4bfb7569c40265332a968634a64e6fb612754f6ec2e97309ccb5b832cafccb0fce0c2124540f5f90363528dda86ba23772d WHIRLPOOL 8cf31d3ec003b2dad393fcc8bc9ec315825e92926a96500144ed1bfcbd06be331487c3198447b0ef85b54bfbec8515d02060a2ba1f0f0425eb089d4223901e0a
+EBUILD icinga2-2.2.1-r2.ebuild 4253 SHA256 239560f15f4535f6f8a3da245e1aa56b7e2e75839649000f0a0efdf8f7ec9b45 SHA512 2f2bfaf451a3f7e0e55e1e1f53ca86b9740214b3ea8d6655a7df18a9689c9f84c0caf15516927a05db0f90ced225dabf31fd6435cf3aef3ad9413e3e4ba5a732 WHIRLPOOL ca4e21939304b4cecd370e8bcdbaa8fd2e4cdad82e54efe1cd941052ecb4a65d6914afc89ecba3d7ab3ab154d32c73073106d015192761bc3aabf00f61e2dc2f
+MISC ChangeLog 3123 SHA256 a580f0f2c0ac986d102fd64dcc8d8d00822228a61843fb42a42c96d1554ea378 SHA512 69fcafd64d45614420c3770995ca6eb90cda24ca068a14f9ec6f90559f6f65723ce0e6777eafa303034c4bb9d658d824abb5b78d9b2eff1776a5807dcbd7a1ca WHIRLPOOL 713f233ce7f462b71581be2d83e8887553a410398e6f08e21e55cbb39ed6400f68018ad9de836f6a166d0bda89794b7776a429b90b564577e496af1cd18527c0
 MISC metadata.xml 564 SHA256 daa07d6dcd6d70107892b050d674f083db74476ffa98623ebbe5d22fe752fe93 SHA512 635f538b78ad2e2b18c49959c7b2b7c06582270738522f10bf7bcac0820fd0222761af4e80ab6756d0e98d11fd6a66763cd9cbc1ccd261694d2de25d68817f8f WHIRLPOOL 513a2dd6f6d39994720e9f62275f840e5efedd77115d033b0957de3b5d21b82efb315a8e3efd386a409aeee254ec05f7aa0fff2ec14888a5c45a2533b3e15c7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUix0wAAoJECRx6z5ArFrDnzEP/3/FwoTa/xDDpBQUkMK+5PY1
-HZamydFw2XNWLwl+48t2O0W+y0L9MEcQd7tk3nqzd762YtIbvkNc/Y4jY00V5ulW
-Ksl/qh/Q/LFs/+TwLECY3Vq2GcW8bjKnc4TCy00S/Rn1qj7Hh6hiRKWVw480XInc
-fHg1k6/QU0mZBBWm0h9c1D0efd5Ojls28skVyYkR3tHyPySEpbo61jkAcPhD69qC
-RIXUKQtS2tWnmV85kgmdnxLx9jHkRKaq5WFamZlTXeUrtTj4Z9D5HUhBBXfO1R6h
-kVx5sa5vpQ6Js+ErY4YGwF2GXpwBDHoJ1hi8j3j7nmiGjIAZZkYQk9OGLTyYblRn
-KsjoruzO359vwG5uJkX+GPiBqfajncum+ZkprZUZHT4edP4y2GiLXkFdT8hN/Bz5
-EpWLv6BAN49/J3XktlJIPQZQ8Eqzx4tifl9Uc9OTVpDYgyY4BEOiB/kigPT8J/RN
-9sgKEcZVGKPUWR693g6SCPiX4meytqkMZefwWbovtSEsiRMN0tZz3roSuVGtGO39
-4omd0GZt0fIDptUjyfLu/FYrOd7sQydHWzq8rlnIy72SeIVpYIHS4ZMeqDuSxW+b
-qZZaYkNYYwKT7Lmc2pcsjVYxa7HD4LPTzE466sGN8amb4xvsaKH/r5NMdnWY7ztP
-OG9FMkcaa4CluGP9PHio
-=s0vU
+iQIcBAEBCAAGBQJUjh0cAAoJECRx6z5ArFrDtMYP/2UBWdVyTy+Mtp6HHdwpg8xS
+zcRjZl4qlnbmjB5e2EBW67QGUGAGRvXU9G14lSvVCYVSOkWxzykWLTcQv0Hiz/qm
+IqOQogNLLK7p/4wPTdVjP2n+0fskOs08gwSCaN4jMIhgd8yJc4guOHwjdEf89rh0
+E5okkV0KqGEwgIuiSaVpJ+0GfYEDW/Te7F1jdbMzCREeZ3N6ZWCHh9yZGMBfvoil
+OzG3VAPKUvZofyblKlytkEL5j/T7CJHWXZpzxVIlVYvQZBX8naeQhQb6jaXeAx57
+jty/D18gQYRPu3T0KFL2/AUfGnaTDoA4ZaWUe8gK4VoTTNacibzeIoQ5R3ssuNHl
+Eop4YEgOH5On9l56V2EY2Tx6nVeG/thgfGH43ykySAnSfcrhfJZJ+RxKjzW3AKN0
+18cS6Xuh2bkCVqrwOsFG9XxyGtfZdBtMXmdY3EHLdBS0HzQ6QiYu9slarwkETXf0
+TVf5FCFPnWNAlGzGtSU+r4cW2CwEtVm9JzyuPpL7cwbe25G0dpn6hhZbPxoRjDlX
+tsDOm7PXzcGDgnvlaaMJa4P6o61wGknRDxjcH+e8m4G53KABacGwTOs3pdNsi+zR
+66J3c/bBIN1H7LClvior8ED4jhiAtUinsGJ7225bfD/hItqk/ig7FpZVYjqZoNgL
+yNcGcuhrgGtoFlZPYkfe
+=W0Sp
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/icinga2/files/icinga2-2.2.1-create_var_cache.patch b/net-analyzer/icinga2/files/icinga2-2.2.1-create_var_cache.patch
new file mode 100644
index 000000000000..beb6b28612db
--- /dev/null
+++ b/net-analyzer/icinga2/files/icinga2-2.2.1-create_var_cache.patch
@@ -0,0 +1,10 @@
+--- a/etc/initsystem/prepare-dirs

++++ b/etc/initsystem/prepare-dirs

+@@ -31,3 +31,7 @@

+ mkdir -p $ICINGA2_RUN_DIR/icinga2/cmd

+ chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_RUN_DIR/icinga2/cmd

+ chmod 2750 $ICINGA2_RUN_DIR/icinga2/cmd

++

++mkdir -p $ICINGA2_STATE_DIR/cache/icinga2

++chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_STATE_DIR/cache/icinga2

++chmod 750 $ICINGA2_STATE_DIR/cache/icinga2

diff --git a/net-analyzer/icinga2/files/icinga2.confd b/net-analyzer/icinga2/files/icinga2.confd
index b4c2c0b38b9e..d30940a1f8c4 100644
--- a/net-analyzer/icinga2/files/icinga2.confd
+++ b/net-analyzer/icinga2/files/icinga2.confd
@@ -1,6 +1,3 @@
 ICINGA2_ERROR_LOG=/var/log/icinga2/error.log
 ICINGA2_STARTUP_LOG=/var/log/icinga2/startup.log
 ICINGA2_LOG=/var/log/icinga2/icinga2.log
-
-ICINGA2_COMMAND_USER=icinga
-ICINGA2_COMMAND_GROUP=icingacmd
diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd
index 0adc20eedffa..4640eab155f6 100644
--- a/net-analyzer/icinga2/files/icinga2.initd
+++ b/net-analyzer/icinga2/files/icinga2.initd
@@ -2,10 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-DAEMON=/usr/sbin/icinga2
-ICINGA2_CONFIG_FILE=/etc/icinga2/icinga2.conf
-ICINGA2_RUN_DIR=/var/run
-ICINGA2_STATE_DIR=/var
+DAEMON="/usr/sbin/icinga2"
+ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf"
+ICINGA2_RUN_DIR="/run/icinga2"
+ICINGA2_STATE_DIR="/var/cache/icinga2"
+ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd"
 ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2/icinga2.pid"
 ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
 
@@ -18,12 +19,27 @@ checkconfig() {
        ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist."
        eend 1
     fi
+
+    ICINGA2_USER=`$DAEMON variable get --current RunAsUser`
+    ICINGA2_GROUP=`$DAEMON variable get --current RunAsGroup`
+
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR
+    checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_STATE_DIR
+    checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_CMD_DIR
+
+    if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then
+        eerror "Icinga 2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details."
+        return 1
+    fi
 }
 
 start() {
-    checkconfig
+    checkconfig || return 1
+
     ebegin "Starting icinga2"
-    $DAEMON $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
+    start-stop-daemon --start --exec "${DAEMON}" \
+        --pidfile "${ICINGA2_PID_FILE}" \
+        -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1
     local retval=$?
     if [ $retval -ne 0 ]; then
         ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details."
diff --git a/net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild
index 55585a8da8f2..addce7431e69 100644
--- a/net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild,v 1.2 2014/12/12 16:50:55 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild,v 1.1 2014/12/14 23:27:21 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )