| 1 |
prometheanfire 14/09/01 21:03:51 |
| 2 |
|
| 3 |
Added: icinga2-2.1.0-create_var_cache.patch |
| 4 |
Log: |
| 5 |
another bump from feandil |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: icinga2-2.1.0-create_var_cache.patch |
| 16 |
=================================================================== |
| 17 |
--- a/etc/initsystem/icinga2-prepare-dirs |
| 18 |
+++ b/etc/initsystem/icinga2-prepare-dirs |
| 19 |
@@ -31,3 +31,7 @@ |
| 20 |
mkdir -p $ICINGA2_RUN_DIR/icinga2/cmd |
| 21 |
chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_RUN_DIR/icinga2/cmd |
| 22 |
chmod 2750 $ICINGA2_RUN_DIR/icinga2/cmd |
| 23 |
+ |
| 24 |
+mkdir -p $ICINGA2_STATE_DIR/cache/icinga2 |
| 25 |
+chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_STATE_DIR/cache/icinga2 |
| 26 |
+chmod 750 $ICINGA2_STATE_DIR/cache/icinga2 |
| 27 |
--- a/etc/initsystem/icinga2.init.d.cmake |
| 28 |
+++ b/etc/initsystem/icinga2.init.d.cmake |
| 29 |
@@ -46,7 +46,6 @@ |
| 30 |
# Start Icinga 2 |
| 31 |
start() { |
| 32 |
printf "Starting Icinga 2: " |
| 33 |
- @CMAKE_INSTALL_FULL_SBINDIR@/icinga2-prepare-dirs $SYSCONFIGFILE |
| 34 |
|
| 35 |
if ! $DAEMON -c $ICINGA2_CONFIG_FILE -d -e $ICINGA2_ERROR_LOG -u $ICINGA2_USER -g $ICINGA2_GROUP > $ICINGA2_STARTUP_LOG 2>&1; then |
| 36 |
echo "Error starting Icinga. Check '$ICINGA2_STARTUP_LOG' for details." |
| 37 |
@@ -105,6 +106,7 @@ |
| 38 |
# Check the Icinga 2 configuration |
| 39 |
checkconfig() { |
| 40 |
printf "Checking configuration: " |
| 41 |
+ @CMAKE_INSTALL_FULL_SBINDIR@/icinga2-prepare-dirs $SYSCONFIGFILE |
| 42 |
|
| 43 |
if ! $DAEMON -c $ICINGA2_CONFIG_FILE -C -u $ICINGA2_USER -g $ICINGA2_GROUP > $ICINGA2_STARTUP_LOG 2>&1; then |
| 44 |
if [ "x$1" = "x" ]; then |
Archives