Browse Source

uncomment non-existing plugins

Waldemar Brodkorb 13 years ago
parent
commit
bde54d74d3

+ 2 - 2
package/icinga/Makefile

@@ -20,8 +20,8 @@ $(eval $(call PKG_template,ICINGA,icinga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 CONFIGURE_ARGS+=	--sysconfdir=/etc/icinga
 
 icinga-install:
-	$(INSTALL_DIR) $(IDIR_ICINGA)/etc
-	$(CP) ./src/etc/icinga $(IDIR_ICINGA)/etc
+	$(INSTALL_DIR) $(IDIR_ICINGA)/etc/icinga/modules
+	$(CP) ./src/etc/icinga/* $(IDIR_ICINGA)/etc/icinga
 	$(INSTALL_DIR) $(IDIR_ICINGA)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/icinga \
 		$(IDIR_ICINGA)/usr/bin

+ 1 - 1
package/icinga/files/icinga.init

@@ -21,7 +21,7 @@ start)
 	icinga -d /etc/icinga/icinga.cfg
 	;;
 stop)
-	kill $(pgrep -f /usr/bin/icinga)
+	kill $(pgrep -f icinga)
 	;;
 restart)
 	sh $0 stop

+ 8 - 8
package/icinga/src/etc/icinga/objects/commands.cfg

@@ -72,10 +72,10 @@ define command{
 ################################################################################
 
 # 'check_local_disk' command definition
-define command{
-        command_name    check_local_disk
-        command_line    $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
-        }
+#define command{
+#        command_name    check_local_disk
+#        command_line    $USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+#        }
 
 
 # 'check_local_load' command definition
@@ -86,10 +86,10 @@ define command{
 
 
 # 'check_local_procs' command definition
-define command{
-        command_name    check_local_procs
-        command_line    $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
-        }
+#define command{
+#        command_name    check_local_procs
+#        command_line    $USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
+#        }
 
 
 # 'check_local_users' command definition