4054 Commits

Author SHA1 Message Date
Bernd Erk
f9e8cc84b9 Design: headline and main menu 2014-11-06 00:09:14 +01:00
Marius Hein
bb7f465c0e Generate apache2 and apache 2.4 configuration
refs #6120
2014-11-05 15:32:09 +01:00
Alexander Fuhr
2e24c53224 Merge branch 'master' into feature/localization-form-6073
Conflicts:
	application/forms/Config/GeneralForm.php
	application/forms/Preference/GeneralForm.php
	library/Icinga/Application/Web.php
2014-11-05 13:27:45 +01:00
Gunnar Beutner
f6595267d6 Use arrays in the Icinga 2 example config 2014-11-05 09:49:59 +01:00
Johannes Meyer
7569c55796 Fix how password hashes are stored and retrieved in DbUserBackend 2014-11-04 15:52:09 +01:00
Johannes Meyer
0db658b7f3 Fix that pgsql privileges were tested in case of mysql
refs #7163
2014-11-04 15:51:11 +01:00
Johannes Meyer
69b38768cf Fix "Icinga\Logger\Logger not found"
The class was moved to Icinga\Application\Logger.
2014-11-04 15:50:34 +01:00
Johannes Meyer
5a169ee656 Fix "PreservingIniWriter not found"
The class was renamed a few commits ago to "IniWriter"
2014-11-04 14:35:57 +01:00
Johannes Meyer
170ded6510 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
Johannes Meyer
581935c26f Fix database setup and add support for the new schema
refs #7163
2014-11-04 13:51:15 +01:00
Johannes Meyer
0c8aa6502b Add `prefix' option when creating the resource config for web2's database
refs #7163
2014-11-04 13:49:01 +01:00
Johannes Meyer
ab5df7d2ba Show notification bar in the wizard as well
refs #7163
2014-11-04 13:48:09 +01:00
Johannes Meyer
805cb9f079 Do not report whether files were skipped because they already exist
I've removed the summary earlier as a user does not configure this in any
way so it's not necessary to show him what should had happened to files
as well.

refs #7163
2014-11-04 13:47:37 +01:00
Eric Lippmann
45d3005f3c Throw exceptions on PHP warnings
Sometimes we miss PHP warnings because our layout overlays them.
2014-11-04 13:20:41 +01:00
Johannes Meyer
8913bf53c9 Fix salt extraction 2014-11-04 13:03:36 +01:00
Johannes Meyer
99277383b9 Fix retrieving a user's data from the database 2014-11-04 13:03:12 +01:00
Johannes Meyer
cad8f7538e Leave it up to the database to decide what is the current time 2014-11-04 12:42:39 +01:00
Johannes Meyer
e463ca836e Drop old schema files 2014-11-04 12:41:17 +01:00
Johannes Meyer
c17eb8c13f Add new PostgreSQL schema file 2014-11-04 12:40:42 +01:00
Matthias Jentsch
f9fee2df70 Do not interrupt authentication chain on invalid ldap connection infos
Catch LdapExceptions and throw AuthenticationException to not interrupt authentication chain

fixes #7497
2014-11-04 12:35:41 +01:00
Thomas Gelf
18bd49e636 Monitoring/Object: re-add process_perfdata
We would live better with unique column names on hosts and services

* Got introduced in 6095e440 and removed in c0e34473
* This might be a canditate for a regression test, as only graphers (PNP) are using this columns right now
* It makes IMO absolutely no sense to keep all those long column names in that object classes
2014-11-01 01:47:55 +01:00
Thomas Gelf
95f9bebdc5 js/loader: support multi-container redirection
Redirections to #!-separated URLs (multiple containers) should also
work when not re-rendering the whole layout.
2014-11-01 01:23:55 +01:00
Thomas Gelf
6298d303c4 js/loader: trigger 'beforerender' container event 2014-11-01 01:12:59 +01:00
Thomas Gelf
f25f4f06d8 js/loader: disable click handler block on refresh
This used to be ways too slow when many elements where involved. Left
the old code there as a reminder. In case we really need it we should
use something faster like an overlay or so.
2014-11-01 01:11:12 +01:00
Alexander Fuhr
f095489017 Fix multiple contacts display in service and host detail pane
fixes #7329
2014-10-31 11:34:48 +01:00
Eric Lippmann
b38e3affb9 Move INI writer classes to the File namespace
fixes #7150
2014-10-31 10:54:53 +01:00
Eric Lippmann
16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01:00
Johannes Meyer
4f1e1ddb6f Adjust the DbUserBackend to reflect the new database schema 2014-10-30 15:40:07 +01:00
Johannes Meyer
538bc8aec8 Drop unused method parameter in DbTool::checkPrivileges 2014-10-30 15:08:04 +01:00
Johannes Meyer
521a36e0af Fix method documentation of DbTool::checkPgsqlPriv() 2014-10-30 15:07:33 +01:00
Johannes Meyer
e58520c3e6 Drop irritating and redundant docblock warning 2014-10-30 15:06:57 +01:00
Johannes Meyer
1bd1b58d46 Drop unused use statement 2014-10-30 15:06:14 +01:00
Eric Lippmann
20a0351908 Add standard authentication.ini 2014-10-30 13:43:43 +01:00
Eric Lippmann
419c4939eb Remove example config files memberships, permissions and restrictions 2014-10-30 13:43:15 +01:00
Eric Lippmann
684e01c9ea Remove config/*.in files 2014-10-30 13:41:33 +01:00
Eric Lippmann
cf7e768f39 Do not spread .gitattributes over multiple files 2014-10-30 13:21:16 +01:00
Eric Lippmann
344bda04b9 Clean .gitignore file
Note to all developers: You must not add your local crap here.
Use .git/info/exclude.
2014-10-30 12:56:22 +01:00
Eric Lippmann
d40497cca2 Remove files related to API doc
I remove these files because the script for creating the API was removed too.
But we'll re-add them sometime I guess.
2014-10-30 12:39:45 +01:00
Eric Lippmann
713d14635d tests: remove extcmd_test
extcmd_test is no longer used anywhere because I removed all command pipe tests.
2014-10-30 12:31:24 +01:00
Johannes Meyer
c1bff9a26e Merge branch 'master' into feature/setup-wizard-7163 2014-10-30 10:38:21 +01:00
Johannes Meyer
a7e942cdc9 Show a warning on the first page in case the user already configured web2
refs #7163
2014-10-30 10:37:51 +01:00
Johannes Meyer
9365e3ca94 Remove the setup token from disk upon completion of the wizard
refs #7163
2014-10-30 10:36:02 +01:00
Eric Lippmann
114c826f0e Remove autotools files
In preparation for package w/ web installer installations all autotools files must be removed
because the installation method using the latter will no longer be supported.

refs #7505
2014-10-30 10:29:52 +01:00
Johannes Meyer
b9209daea5 Add another useful TODO
refs #7163
2014-10-30 09:54:14 +01:00
Johannes Meyer
ec47f6bdb3 Create permissions.ini when defining the initial administrator
refs #7163
2014-10-30 09:53:58 +01:00
Eric Lippmann
0bf6dc24a8 monitoring: Use command transports constants in the command transport factory 2014-10-30 09:53:55 +01:00
Eric Lippmann
1b83ec3ce2 Preferences: Fix saving preferences when using a database store
Our DbSelect::where() is not (or no longer?) compatible w/ Zend_Db_Select::where().
DbStore::load() now uses Zend_Db_Select but we should definitely think about our
DbSelect::where() implementation.

fixes #7353
2014-10-30 09:49:21 +01:00
Eric Lippmann
c4554ac692 Log exceptions when saving preferences 2014-10-30 09:48:25 +01:00
Eric Lippmann
39729c9580 Logger: Fix level comparison 2014-10-29 16:51:17 +01:00
Eric Lippmann
2698516005 Auth: Remove setting the not existent layout 'login' when logging out externally authenticated users
fixes #7191
2014-10-29 16:31:17 +01:00