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

Fix CGI path in the Apache config. 

Fixes #5062
This commit is contained in:
Gunnar Beutner 2013-11-12 08:49:19 +01:00
parent c8222dd029
commit 5b81e62f0a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/CMakeLists.txt
View File

@ -17,6 +17,8 @@
include(InstallConfig) 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/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-host.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)
install_if_not_exists(icinga2/conf.d/generic-service.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) install_if_not_exists(icinga2/conf.d/generic-service.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d)

12
etc/icinga/icinga-classic-apache.conf → etc/icinga/icinga-classic-apache.conf.cmake
View File

@ -5,9 +5,9 @@
# configuration file. Customize the paths, etc. as # configuration file. Customize the paths, etc. as
# needed to fit your system. # 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 # SSLRequireSSL
Options ExecCGI Options ExecCGI
AllowOverride None AllowOverride None
@ -18,13 +18,13 @@ ScriptAlias /icinga/cgi-bin "/usr/lib64/icinga/cgi"
# Allow from 127.0.0.1 # Allow from 127.0.0.1
AuthName "Icinga Access" AuthName "Icinga Access"
AuthType Basic AuthType Basic
AuthUserFile /etc/icinga/passwd AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
Require valid-user Require valid-user
</Directory> </Directory>
Alias /icinga "/usr/share/icinga/" Alias /icinga "@CMAKE_INSTALL_FULL_DATADIR@/icinga/"
<Directory "/usr/share/icinga/"> <Directory "@CMAKE_INSTALL_FULL_DATADIR@/icinga/">
# SSLRequireSSL # SSLRequireSSL
Options None Options None
AllowOverride All AllowOverride All
@ -35,7 +35,7 @@ Alias /icinga "/usr/share/icinga/"
# Allow from 127.0.0.1 # Allow from 127.0.0.1
AuthName "Icinga Access" AuthName "Icinga Access"
AuthType Basic AuthType Basic
AuthUserFile /etc/icinga/passwd AuthUserFile @CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga/passwd
Require valid-user Require valid-user
</Directory> </Directory>