tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-10-31 11:24:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,530 Commits 138 Branches 76 Tags
Commit Graph

117 Commits

Author SHA1 Message Date
Johannes Meyer
13edbf901d UserBackend: Implement interface ConfigAwareFactory 
refs #9609
 2015-07-29 13:44:26 +02:00
Paul Richards
aac5d49eed IIS: use 'config' folder within icingaweb root instead of '/etc/icingaweb2' on Windows 
Signed-off-by: Alexander A. Klimov <alexander.klimov@netways.de>
with the following changes:

Make use of Platform::isWindows()
Call ::setupAutoloader() before that

fixes #8916
 2015-06-12 14:46:00 +02:00
Alexander A. Klimov
7ea6eeb20d Revert "Don't use /etc/icingaweb2 as config path on Windows" 
This reverts commit 48870bb7e2ed392a6898591b20eace0c96f54993.
 2015-06-12 13:29:36 +02:00
Alexander A. Klimov
48870bb7e2 Don't use /etc/icingaweb2 as config path on Windows 
fixes #8916
 2015-06-12 11:57:44 +02:00
Alexander A. Klimov
1e0219f697 Revert "IIS: use 'config' folder within icingaweb root on windows" 
This reverts commit 4607a85cf5745bb99a12f4b5e829447d82c09f6e.
 2015-06-12 10:38:11 +02:00
Paul Richards
4607a85cf5 IIS: use 'config' folder within icingaweb root on windows 
fixes #8916
 2015-06-11 18:10:37 +02:00
Eric Lippmann
ba258524a8 Don't setup the DateTimeFactory when bootstrapping Icinga Web 2 
DateTimeFactory will be removed soon.

refs #6778
 2015-05-19 11:23:50 +02:00
Johannes Meyer
36fed03764 Do not log that the logging configuration is invalid on every request 
Instead, log those messages *everytime* a subsequent message is being
logged.

refs #8957
 2015-04-13 17:11:42 +02:00
Johannes Meyer
67ad575cf5 Set the configured logging level even if the configured logging type is invalid 
refs #8957
 2015-04-13 17:09:49 +02:00
Eric Lippmann
8563d5ed3f PHPDoc: Use @var instead of @type 
Becasue of too many kittens PSR-5 backed off of deprecating @var.
So that's the way we go too.
 2015-03-12 16:08:47 +01:00
Eric Lippmann
6bae2e0a53 Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
Eric Lippmann
5b4fab0750 Add license header 
This time without syntax errors hopefully :)
 2015-02-03 16:27:59 +01:00
Eric Lippmann
5fa2e3cfdc Revert "Add license header" 
This reverts commit 338d067aba41dd6e9178cebec5433eecd614196e.
 2015-02-03 16:16:26 +01:00
Eric Lippmann
338d067aba Add license header 
fixes #7788
 2015-02-03 15:51:04 +01:00
Johannes Meyer
47b27fcfe4 setup: Look for the authentication.ini instead of the config.ini 
The config.ini does not include any settings mandatory to operate
Icinga Web 2, but the authentication.ini does.

refs #8134
 2015-01-27 13:34:59 +01:00
Eric Lippmann
7bd42b476f bootstrap: Load setup module in case the setup token exists 
The web setup may write the config.ini even if it errors. Thus our bootstrap
has to load the setup module whenever the setup.token exists.
Another approach would to write the config.ini in our web setup at the very end.
 2015-01-23 15:27:52 +01:00
Eric Lippmann
611d01788f Add setup related utility functions to ApplicationBootstrap.php 2014-12-29 14:29:31 +01:00
Eric Lippmann
7d36a59c67 Use '@return $this' instead of '@return self' for document fluent interfaces in ApplicationBootstrap.php 2014-12-29 14:01:19 +01:00
Eric Lippmann
8ec0740005 Merge branch 'master' into feature/packages-4075 2014-12-18 14:02:17 +01:00
Eric Lippmann
2b5fe7baf4 Set default config dir to '/etc/icingaweb2' 2014-12-10 09:30:12 +01:00
Eric Lippmann
916868a051 Revert "Add support for "core" modules and make the setup module such a module" 
This reverts commit 8af13f564b3f8e69c2c1abcda5d7e2e5266c3c7d.

The setup module must only be loaded when necessary not always.
 2014-12-09 16:28:05 +01:00
Johannes Meyer
196b6a4875 Ensure that Zend is loaded when showing status information in the CLI 
fixes #7869
 2014-12-09 15:38:13 +01:00
Johannes Meyer
7621f6642d Adjust usages of Icinga\Application\Config 
refs #7147
 2014-11-18 13:11:52 +01:00
Johannes Meyer
812f9af949 Change modulePath setting to module_path 
fixes #7694
 2014-11-17 10:10:08 +01:00
Eric Lippmann
6ba4e55277 Throw exception on E_NOTICE 
Use of uninitialized values must be detected asap.
 2014-11-15 01:20:27 +01:00
Eric Lippmann
2c0122ba9f Fix ApplicationBootstrap::getBootstrapDirectory() when Icinga Web 2 is served using PHP's built-in web server 2014-11-15 01:04:14 +01:00
Eric Lippmann
11bb8dbab0 icingacli web serve: Fix "PHP Notice: Use of undefined constant ICINGA_LIBDIR" 2014-11-14 16:02:17 +01:00
Eric Lippmann
37dd2f5dd2 Do not load Zend on the CLI and remove our library from the include path 
Adding Icinga Web 2's library to the include is not necessary for getting the Zend_Plugin_Loader working.
 2014-11-14 14:04:24 +01:00
Eric Lippmann
48a468b888 Add our vendor path to the include path 2014-11-13 19:52:28 +01:00
Eric Lippmann
81b144d057 Fix locale setup 
The CLI must not try to use HTTP_ACCEPT_LANGUAGE. Avoided double try-catch blocks.

refs #6073
 2014-11-13 18:02:03 +01:00
Eric Lippmann
e3c70bec6d Fix timezone setup 
The CLI must not try to use our web timezone detection thingy.

refs #6073
 2014-11-13 17:07:36 +01:00
Eric Lippmann
ac2ec83852 Merge branch 'master' into feature/localization-form-6073 
Conflicts:
	library/Icinga/Application/ApplicationBootstrap.php
	test/php/library/Icinga/User/Store/DbStoreTest.php
 2014-11-13 17:03:41 +01:00
Eric Lippmann
f427577067 Add getVendorDir() in favor of constant ICINGAWEB_VENDORS 2014-11-13 09:38:04 +01:00
Eric Lippmann
bfa834fc3b Remove constant ICINGAWEB_APPDIR 
We should avoid use of constants.
 2014-11-13 09:33:31 +01:00
Eric Lippmann
9c103a9864 Remove constant ICINGAWEB_BASEDIR 
We should avoid use of constants.
 2014-11-13 09:24:51 +01:00
Eric Lippmann
75475b1684 Rename getBootstrapDirecory() to getBootstrapDirectory() 2014-11-12 17:14:43 +01:00
Eric Lippmann
c394cd0bff Use realpath in ApplicationBootstrap::getBootstrapDirecory() 
If the CLI is called from source, the base directory is now set to the correct path.
Packagers will have to provide the path to the base directory though.
 2014-11-12 17:11:48 +01:00
Johannes Meyer
db7954c350 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 17:05:13 +01:00
Eric Lippmann
ec6b56a060 Allow to define Icinga Web 2's base directory while bootstrapping 2014-11-12 15:52:43 +01:00
Eric Lippmann
b27d1d0058 Merge branch 'master' into feature/setup-wizard-7163 2014-11-12 14:48:15 +01:00
Eric Lippmann
a081db08a4 icingacli: Fix "Notice: Constant ICINGAWEB_BASEDIR already defined" 2014-11-12 14:43:58 +01:00
Eric Lippmann
6089372c42 Do not define ICINGAWEB_BASEDIR in index.php 
There's SCRIPT_FILENAME. The constants will be removed shortly.
 2014-11-12 14:39:45 +01:00
Eric Lippmann
277765ac72 No longer make ICINGAWEB_APPDIR configureable 2014-11-12 13:18:05 +01:00
Eric Lippmann
11e13582e2 Define the ICINGAWEB_VENDORS contant 2014-11-12 13:17:18 +01:00
Eric Lippmann
8c9465ffbd Fix ICINGAWEB_APPDIR location if the Icinga library is in PHP's include path 2014-11-12 13:06:43 +01:00
Eric Lippmann
877e9101f3 Do not define the constant ICINGAWEB_LIBDIR 
This constant should not be needed anywhere.
 2014-11-12 12:55:16 +01:00
Alexander Fuhr
8d120762de Add timezone detection to `setupTimezone' in ApplicationBootstrap 2014-11-12 12:13:46 +01:00
Johannes Meyer
c3e28a42fb Remove configuration option for setting the access mode on new files 2014-11-12 09:40:07 +01:00
Johannes Meyer
9d292269b1 Merge branch 'master' into feature/setup-wizard-7163 
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
 2014-11-11 09:44:11 +01:00
Johannes Meyer
8af13f564b Add support for "core" modules and make the setup module such a module 
refs #7163
 2014-11-10 17:34:49 +01:00