Add --with-icingaweb-log-path.

refs #4926

Makefile.in

@@ -9,6 +9,7 @@ exec_prefix=@exec_prefix@
 
 HTTPD_CONFIG_PATH=@httpd_config_path@
 ICINGAWEB_CONFIG_PATH=@icingaweb_config_path@
+ICINGAWEB_LOG_PATH=@icingaweb_log_path@
 
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
@@ -114,7 +115,7 @@ copy-folder-%:
 
 ensure-writable-folders:
 	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/var/
-	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(prefix)/var/log
+	$(INSTALL) -m 775 $(INSTALL_OPTS_WEB) -d $(DESTDIR)$(ICINGAWEB_LOG_PATH)
 	chmod -R 775 $(DESTDIR)$(ICINGAWEB_CONFIG_PATH)
 
 

config/.gitignore

@@ -1,4 +1,5 @@
 authentication.ini
+config.ini
 modules/monitoring/backends.ini
 modules/monitoring/instances.ini
 resources.ini

config/config.ini.in

@@ -17,13 +17,13 @@ timeFormat          = "g:i A"
 enable              = "1"
 type                = "stream"
 verbose             = "1"
-target              = "{app}/var/log/icinga.log"
+target              = "@icingaweb_log_path@/icingaweb.log"
 
 ; For development and debug purposes: Logs additional (non critical) events to a
 ; seperate log
 debug.enable        = "1"
 debug.type          = "stream"
-debug.target        = "{app}/var/log/icinga.debug.log"
+debug.target        = "@icingaweb_log_path@/icingaweb.debug.log"
 
 
 ; Use ini store to store preferences on local disk
@@ -35,4 +35,4 @@ type                = "ini"
 ;type=db
 ;resource=icingaweb-mysql
 
-configPath          = "{app}/config/preferences"
+configPath          = "@icingaweb_config_path@/preferences"

configure

@@ -635,6 +635,7 @@ internal_db_port
 internal_db_host
 internal_db_name
 internal_db_type
+icingaweb_log_path
 icingaweb_config_path
 bin_group
 bin_user
@@ -690,6 +691,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 with_icingaweb_config_path
+with_icingaweb_log_path
 with_web_user
 with_web_group
 with_web_path
@@ -1351,7 +1353,10 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-icingaweb-config-path=PATH
-                          Configuration path for icinga web
+                          Configuration path for icinga web (default
+                          $prefix/config)
+  --with-icingaweb-log-path=PATH
+                          Log path for icinga web (default $prefix/var/log)
   --with-web-user=USER    username for web writable files (default www-data)
   --with-web-group=GROUP  group for web writable files (default www-data)
   --with-web-path=PATH    web sub path (default /icingaweb)
@@ -2276,6 +2281,19 @@ else
 fi
 
 
+#
+#   Log files
+#
+
+# Check whether --with-icingaweb_log_path was given.
+if test "${with_icingaweb_log_path+set}" = set; then
+  withval=$with_icingaweb_log_path; icingaweb_log_path=$withval
+else
+  icingaweb_log_path=$prefix/var/log
+
+fi
+
+
 #
 #   Users for webfiles
 #
@@ -2977,6 +2995,7 @@ fi
 
 
 
+
 # Internal db setup
 
 
@@ -3032,7 +3051,7 @@ fi
 #
 #   Create config files
 #
-ac_config_files="$ac_config_files Makefile config/authentication.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf public/.htaccess public/index.php"
+ac_config_files="$ac_config_files Makefile config/authentication.ini config/config.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf public/.htaccess public/index.php"
 
 
 #
@@ -3649,6 +3668,7 @@ do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "config/authentication.ini") CONFIG_FILES="$CONFIG_FILES config/authentication.ini" ;;
+    "config/config.ini") CONFIG_FILES="$CONFIG_FILES config/config.ini" ;;
     "config/resources.ini") CONFIG_FILES="$CONFIG_FILES config/resources.ini" ;;
     "config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;;
     "config/modules/monitoring/instances.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/instances.ini" ;;

configure.ac

@@ -30,11 +30,20 @@ AC_CHECK_PHP_MODULE([sockets json])
 #   Configuration files
 #
 AC_ARG_WITH([icingaweb_config_path],
-    AS_HELP_STRING([--with-icingaweb-config-path=PATH], [Configuration path for icinga web]),
+    AS_HELP_STRING([--with-icingaweb-config-path=PATH], [Configuration path for icinga web (default $prefix/config)]),
     icingaweb_config_path="'$withval'",
     icingaweb_config_path="'$prefix/config/'"
 )
 
+#
+#   Log files
+#
+AC_ARG_WITH([icingaweb_log_path],
+    AS_HELP_STRING([--with-icingaweb-log-path=PATH], [Log path for icinga web (default $prefix/var/log)]),
+    icingaweb_log_path=$withval,
+    icingaweb_log_path=$prefix/var/log
+)
+
 #
 #   Users for webfiles
 #
@@ -378,6 +387,7 @@ AC_SUBST(httpd_config_path)
 AC_SUBST(bin_user)
 AC_SUBST(bin_group)
 AC_SUBST(icingaweb_config_path)
+AC_SUBST(icingaweb_log_path)
 
 # Internal db setup
 AC_SUBST(internal_db_type)
@@ -437,6 +447,7 @@ AC_SUBST(INSTALL_OPTS_WEB)
 AC_CONFIG_FILES([
     Makefile
     config/authentication.ini
+    config/config.ini
     config/resources.ini
     config/modules/monitoring/backends.ini
     config/modules/monitoring/instances.ini