tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix config path in index.php (generate with configure). 

refs #4926
This commit is contained in:
Michael Friedrich 2013-10-20 17:47:35 +02:00 committed by Marius Hein
parent 6b2cb571b6
commit fe03f5b246
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -3032,7 +3032,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"
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"
#
@ -3654,6 +3654,7 @@ do
"config/modules/monitoring/instances.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/instances.ini" ;;
"etc/apache/icingaweb.conf") CONFIG_FILES="$CONFIG_FILES etc/apache/icingaweb.conf" ;;
"public/.htaccess") CONFIG_FILES="$CONFIG_FILES public/.htaccess" ;;
"public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;;
*) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}

1
configure.ac
View File

@ -442,6 +442,7 @@ AC_CONFIG_FILES([
config/modules/monitoring/instances.ini
etc/apache/icingaweb.conf
public/.htaccess
public/index.php
])
#

1
public/.gitignore vendored
View File

@ -1 +1,2 @@
.htaccess
index.php

2
public/index.php → public/index.php.in
View File

@ -14,4 +14,4 @@ require_once dirname(__FILE__). '/../library/Icinga/Application/Web.php';
use Icinga\Application\Web;
Web::start(dirname(__FILE__) . '/../config/')->dispatch();
Web::start(@icingaweb_config_path@)->dispatch();