[icinga-checkins] icinga.org: icinga-web/master: * Fixed configuration chaos (fixes #2233)

git at icinga.org git at icinga.org
Thu Jan 26 11:44:53 CET 2012


Module: icinga-web
Branch: master
Commit: 39e8ae3d04f12fbb5227bdfb0f858a250bf42ed5
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=39e8ae3d04f12fbb5227bdfb0f858a250bf42ed5

Author: Marius Hein <marius.hein at netways.de>
Date:   Thu Jan 26 11:43:29 2012 +0100

* Fixed configuration chaos (fixes #2233)
* Fixed logout redirect if no HTTP_Basic (fixes #1005)

---

 .gitignore                                         |    7 +-
 Makefile.in                                        |   11 ++-
 app/Makefile.in                                    |    1 +
 app/config/factories.xml                           |    2 +-
 app/config/factories.xml.in                        |   98 ++++++++++++++++++++
 app/config/settings.xml.in                         |   10 ++-
 app/modules/AppKit/config/module.xml.in            |    5 +-
 .../AppKit/views/LogoutSuccessView.class.php       |    5 +-
 app/modules/Cronks/config/module.xml.in            |    5 +
 app/modules/Reporting/config/module.xml.in         |    2 +-
 .../Web/config/{module.xml => module.xml.in}       |    9 ++-
 configure                                          |   12 ++-
 configure.ac                                       |   10 +-
 etc/{sitecfg => conf.d}/Makefile.in                |   15 ++-
 etc/{sitecfg => conf.d}/access.xml.in              |    0 
 etc/{sitecfg => conf.d}/auth.xml                   |    0 
 etc/{sitecfg => conf.d}/cronks.xml                 |    0 
 etc/{sitecfg => conf.d}/databases.xml.in           |    0 
 etc/conf.d/factories.xml                           |   31 ++++++
 etc/{sitecfg => conf.d}/icinga.site.css            |    0 
 .../icinga.site.xml => etc/conf.d/icinga.xml       |    0 
 .../reporting.xml => conf.d/module_reporting.xml}  |   14 ++--
 etc/conf.d/settings.xml                            |   17 ++++
 etc/{sitecfg => conf.d}/sla.xml.in                 |    0 
 etc/conf.d/translation.xml                         |   35 +++++++
 etc/sitecfg/factories.site.xml                     |   15 ---
 etc/sitecfg/icinga.site.xml                        |   27 ------
 etc/sitecfg/settings.site.xml                      |   14 ---
 etc/sitecfg/translation.xml                        |   38 --------
 29 files changed, 252 insertions(+), 131 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-web.git;a=commitdiff;h=39e8ae3d04f12fbb5227bdfb0f858a250bf42ed5




More information about the icinga-checkins mailing list