[icinga-checkins] icinga.org: icinga-core/rbartels/cgi-current: Revert " change configure param --with-checkresult-dir to --with-spool-dir"

git at icinga.org git at icinga.org
Thu Apr 14 22:20:16 CEST 2011


Module: icinga-core
Branch: rbartels/cgi-current
Commit: 879acbb043c717a7c26d6deb5076b56e4324d232
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=879acbb043c717a7c26d6deb5076b56e4324d232

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Apr 11 19:39:34 2011 +0200

Revert "change configure param --with-checkresult-dir to --with-spool-dir"

This reverts commit 755429bdbc77006f7a6f17bfc65149f4e02c6c2d.

---

 Makefile.in                 |    4 ++--
 configure.in                |   12 ++++++------
 sample-config/icinga.cfg.in |    4 ++--
 subst.in                    |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 62b16ba..6736d19 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,7 +34,7 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 LOGDIR=@localstatedir@
-SPOOLDIR=@SPOOLDIR@
+CHECKRESULTDIR=@CHECKRESULTDIR@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
@@ -378,7 +378,7 @@ install-basic:
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
 	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(SPOOLDIR)
+	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
 	if [ $(INSTALLPERLSTUFF) = yes ]; then \
 		$(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
 	fi;
diff --git a/configure.in b/configure.in
index d3bb685..1246599 100644
--- a/configure.in
+++ b/configure.in
@@ -262,12 +262,12 @@ fi
 AC_SUBST(HTTPD_CONF)
 
 dnl Location of check result path
-SPOOLDIR=no
-AC_ARG_WITH(spool-dir,AC_HELP_STRING([--with-spool-dir=<path>],[sets path to spool base directory]),SPOOLDIR=$withval,SPOOLDIR=no)
-if test x$SPOOLDIR = xno; then
-	SPOOLDIR="$localstatedir/spool/icinga"
+CHECKRESULTDIR=no
+AC_ARG_WITH(checkresult-dir,AC_HELP_STRING([--with-checkresult-dir=<path>],[sets path to check results spool directory]),CHECKRESULTDIR=$withval,CHECKRESULTDIR=no)
+if test x$CHECKRESULTDIR = xno; then
+	CHECKRESULTDIR="$localstatedir/spool/checkresults"
 fi
-AC_SUBST(SPOOLDIR)
+AC_SUBST(CHECKRESULTDIR)
 
 dnl Location of check result path
 TMPDIR=no
@@ -1216,7 +1216,7 @@ AC_MSG_RESULT([           Build IDOUtils:  no])
 fi
 AC_MSG_RESULT([        Install \${prefix}:  $prefix])
 AC_MSG_RESULT([                Lock file:  $lockfile])
-AC_MSG_RESULT([          Spool directory:  $SPOOLDIR])
+AC_MSG_RESULT([   Check result directory:  $CHECKRESULTDIR])
 AC_MSG_RESULT([           Init directory:  $init_dir])
 AC_MSG_RESULT([  Apache conf.d directory:  $HTTPD_CONF])
 AC_MSG_RESULT([             Mail program:  $MAIL_PROG])
diff --git a/sample-config/icinga.cfg.in b/sample-config/icinga.cfg.in
index 7cfbb2a..17f2c7e 100644
--- a/sample-config/icinga.cfg.in
+++ b/sample-config/icinga.cfg.in
@@ -168,7 +168,7 @@ command_check_interval=-1
 # directory level instead of on the file, as the file is deleted every
 # time its contents are processed.
 
-command_file=@SPOOLDIR@/rw/icinga.cmd
+command_file=@localstatedir@/rw/icinga.cmd
 
 
 
@@ -518,7 +518,7 @@ max_check_result_reaper_time=30
 # Note: Make sure that only one instance of Icinga has access
 # to this directory!  
 
-check_result_path=@SPOOLDIR@/checkresults
+check_result_path=@CHECKRESULTDIR@
 
 
 
diff --git a/subst.in b/subst.in
index 69c5b34..4be8531 100755
--- a/subst.in
+++ b/subst.in
@@ -27,7 +27,7 @@ while ($f = shift @ARGV) {
 		s|\@localstatedir\@|@localstatedir@|g;
 		s|\@sysconfdir\@|@sysconfdir@|g;
 		s|\@TMPDIR\@|@TMPDIR@|g;
-		s|\@SPOOLDIR\@|@SPOOLDIR@|g;
+		s|\@CHECKRESULTDIR\@|@CHECKRESULTDIR@|g;
 		s|\@datadir\@|@datarootdir@|g;
 		s|\@sbindir\@|@sbindir@|g;
 		s|\@bindir\@|@bindir@|g;





More information about the icinga-checkins mailing list