* install: add configure option to set log dir and cgi log dir and ph…

…papi log dir #1715

** e.g. --with-phpapi-log-dir=/var/log/icinga/api --with-log-dir=/var/log/icinga --with-cgi-log-dir=/var/log/icinga/gui
** apache user permissions

* install: fix icinga.cmd and log dir replacement in icinga-api aubmodule #1573 #1715

refs #1573
refs #1715

Changelog

@@ -20,6 +20,9 @@ ENHANCEMENTS
 * install: add --with-p1-file-dir allowing custom location (default is now $libdir instead of $bindir) #1569
 	** only when embedded perl is enabled
 	** affects (new_)mini_epn and icinga.cfg
+* install: add configure option to set log dir and cgi log dir and phpapi log dir #1715
+	** e.g. --with-phpapi-log-dir=/var/log/icinga/api --with-log-dir=/var/log/icinga --with-cgi-log-dir=/var/log/icinga/gui
+	** apache user permissions
 
 * config: add easy-to-use config examples and scripts for notifications #1697
 	** advanced notify-by-email
@@ -43,6 +46,7 @@ FIXES
 
 * install: fix event handlers cmd file location in contrib #1501
 * install: fix make install-idoutils overwrites sample - adding idoutils.cfg-sample instead #1625
+* install: fix icinga.cmd and log dir replacement in icinga-api aubmodule #1573 #1715
 
 * config: deprecate log_external_commands_user #1619
 * config: tune icinga.cfg for performance, enable_environment_macros=0, enable_embedded_perl=0 by default #1635

Makefile.in

@@ -33,7 +33,8 @@ LDFLAGS=@LDFLAGS@ @LIBS@
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@LOGDIR@
+CGILOGDIR=@CGILOGDIR@
 CHECKRESULTDIR=@CHECKRESULTDIR@
 EXTCMDFILEDIR=@EXTCMDFILEDIR@
 P1FILELOC=@P1FILELOC@
@@ -44,6 +45,7 @@ LIBEXECDIR=@libexecdir@
 HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
+INSTALL_OPTS_WEB=@INSTALL_OPTS_WEB@
 COMMAND_OPTS=@COMMAND_OPTS@
 HTTPD_CONF=@HTTPD_CONF@
 INIT_DIR=@init_dir@
@@ -362,6 +364,7 @@ install-base:
 	cd $(SRC_BASE) && $(MAKE) install
 
 install-cgis:
+	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(CGILOGDIR)
 	cd $(SRC_CGI) && $(MAKE) install
 
 install:
@@ -466,7 +469,7 @@ install-idoutils:
 
 install-api:
 	@if [ x$(USE_ICINGAAPI) = xyes ]; then \
-                cd $(SRC_ICINGAAPI) && $(MAKE) install; \
+		cd $(SRC_ICINGAAPI) && $(MAKE) install; \
                 echo "" ;\
                 echo "*** API installed ***" ;\
 		echo "" ;\

cgi/Makefile.in

@@ -10,7 +10,7 @@ SRC_XDATA=../xdata
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-LOGDIR=@localstatedir@
+LOGDIR=@CGILOGDIR@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@