[icinga-checkins] icinga.org: icinga2/next: Fix CGI path in the Apache config.

git at icinga.org git at icinga.org
Tue Nov 12 08:50:05 CET 2013


Module: icinga2
Branch: next
Commit: 5b81e62f0a7fcc242b4c7a0d83123a9bb147bda5
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=5b81e62f0a7fcc242b4c7a0d83123a9bb147bda5

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Tue Nov 12 08:49:19 2013 +0100

Fix CGI path in the Apache config.

Fixes #5062

---

 etc/CMakeLists.txt                                         |    2 ++
 ...lassic-apache.conf => icinga-classic-apache.conf.cmake} |   12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 49d7ed7..40e3308 100644
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -17,6 +17,8 @@
 
 include(InstallConfig)
 
+configure_file(icinga/icinga-classic-apache.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga/icinga-classic-apache.conf)
+
 install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2)
 install_if_not_exists(icinga2/conf.d/generic-host.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
 install_if_not_exists(icinga2/conf.d/generic-service.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
diff --git a/etc/icinga/icinga-classic-apache.conf b/etc/icinga/icinga-classic-apache.conf.cmake
similarity index 66%
rename from etc/icinga/icinga-classic-apache.conf
rename to etc/icinga/icinga-classic-apache.conf.cmake
index b337f08..6084f54 100644
--- a/etc/icinga/icinga-classic-apache.conf
+++ b/etc/icinga/icinga-classic-apache.conf.cmake
@@ -5,9 +5,9 @@
 # configuration file.  Customize the paths, etc. as
 # needed to fit your system.
 
-ScriptAlias /icinga/cgi-bin "/usr/lib64/icinga/cgi"
+ScriptAlias /icinga/cgi-bin "@CMAKE_INSTALL_FULL_LIBDIR@/icinga/cgi"
 
-<Directory "/usr/lib64/icinga/cgi">
+<Directory "@CMAKE_INSTALL_FULL_LIBDIR@/icinga/cgi">
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
@@ -18,13 +18,13 @@ ScriptAlias /icinga/cgi-bin "/usr/lib64/icinga/cgi"
 #  Allow from 127.0.0.1
    AuthName "Icinga Access"
    AuthType Basic
-   AuthUserFile /etc/icinga/passwd
+   AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
    Require valid-user
 </Directory>
 
-Alias /icinga "/usr/share/icinga/"
+Alias /icinga "@CMAKE_INSTALL_FULL_DATADIR@/icinga/"
 
-<Directory "/usr/share/icinga/">
+<Directory "@CMAKE_INSTALL_FULL_DATADIR@/icinga/">
 #  SSLRequireSSL
    Options None
    AllowOverride All
@@ -35,7 +35,7 @@ Alias /icinga "/usr/share/icinga/"
 #  Allow from 127.0.0.1
    AuthName "Icinga Access"
    AuthType Basic
-   AuthUserFile /etc/icinga/passwd
+   AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
    Require valid-user
 </Directory>
 





More information about the icinga-checkins mailing list