From fe03f5b246f4de5f0015d6124afb2861b04e3737 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Sun, 20 Oct 2013 17:47:35 +0200
Subject: [PATCH] Fix config path in index.php (generate with configure).

refs #4926
---
 configure                          | 3 ++-
 configure.ac                       | 1 +
 public/.gitignore                  | 1 +
 public/{index.php => index.php.in} | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
 rename public/{index.php => index.php.in} (90%)

diff --git a/configure b/configure
index 9bac95a95..e81c3d28a 100755
--- a/configure
+++ b/configure
@@ -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;}
diff --git a/configure.ac b/configure.ac
index 1a6f8f138..5b64bc7bd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -442,6 +442,7 @@ AC_CONFIG_FILES([
     config/modules/monitoring/instances.ini
     etc/apache/icingaweb.conf
     public/.htaccess
+    public/index.php
 ])
 
 #
diff --git a/public/.gitignore b/public/.gitignore
index 03c88fd7a..4c3d24e81 100644
--- a/public/.gitignore
+++ b/public/.gitignore
@@ -1 +1,2 @@
 .htaccess
+index.php
diff --git a/public/index.php b/public/index.php.in
similarity index 90%
rename from public/index.php
rename to public/index.php.in
index 891f736fb..3897898a1 100644
--- a/public/index.php
+++ b/public/index.php.in
@@ -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();