Commit Graph

2087 Commits

Author SHA1 Message Date
Thomas Gelf 4202e34d13 bootstrapping: play nice with duplicate modules
A module loaded manually could also exist in the list of enabled
modules if a configuration is given and a module with the same name
has been enabled. This used to confuse documentation.
2014-06-04 23:37:36 +00:00
Thomas Gelf bdcec5a253 Cli\Loader: allow injecting a module name
This helps those who prefer to create their own executables instead
of creating icingacli subcommands.

refs #6411
2014-06-04 23:04:11 +00:00
Thomas Gelf eadb6cb518 bootstrapping: allow to retrieve a modules base...
...directory if it has been loaded but neither enabled nor installed.

refs #6411
2014-06-04 22:59:48 +00:00
Thomas Gelf 0e6aecbd43 bootstrapping: allow to load modules neither...
...enabled nor installed by passing their base directory. In favour
of this parameter I dropped the possibility to inject a Module class
for testing purposes. There is no such test and I see no point in
doing so.

refs #6411
2014-06-04 22:57:50 +00:00
Thomas Gelf e076d2d1d6 bootstrapping: create only one CLI loader instance
This used to work fine as long as you didn't try to interfere from
outside to influence the cli loader. The instance returned by
cliLoader() was not the same as used internally once dispatching the
CLI command.

refs #6411
2014-06-04 22:52:38 +00:00
Thomas Gelf a221afd933 bootstrapping: autoloader exceptions should not...
...require to be autoloaded.

refs #6411
2014-06-04 22:50:08 +00:00
Thomas Gelf 602b448505 bootstrapping: only web should depend on forms
This fixes the problem that CLI scripts or other applications without
an application directory would badly fail because of missing web forms.

refs #6411
2014-06-04 22:46:16 +00:00
Carlos Cesario 76a9e67e35 Added initial pt_BR translation
fixes #6395

Signed-off-by: Thomas Gelf <thomas@gelf.net>
2014-06-04 22:08:13 +00:00
Thomas Gelf d66055bce2 CLI/monitoring/list: fix formatting-related error
Small fix, this got broken by language-related changes in a66a1a47.
2014-06-04 21:25:26 +00:00
Thomas Gelf bdc3423d4e packaging/config: allow to override APPDIR
It is now possible to either define ICINGAWEB_APPDIR in an Environment
variable or to define it as a PHP constant before bootstrapping.

fixes #6400
2014-06-04 21:22:29 +00:00
Thomas Gelf 55880cb5a3 packaging/config: rename ICINGA_APPDIR
Renamed ICINGA_APPDIR to ICINGAWEB_APPDIR for consistency. This way
it fits ICINGAWEB_CONFIGDIR.

refs #6400
2014-06-04 21:11:27 +00:00
Thomas Gelf e992f152bb packaging/configuration: get rid of _ENV
We should use _SERVER for our settings as it works fine on CLI and
for web servers.

refs #6400
2014-06-04 21:08:49 +00:00
Michael Friedrich 8fe804bbd4 Enable icinga snapshot repository and fetch latest icinga2 packages
Furthermore get rid of multiple 'exec' calls and use 'package' instead.
Additional refactoring for icinga 2 features.

fixes #6405
2014-06-04 16:09:50 +02:00
Marius Hein 29f593a357 Authentication: Add backend to handle external authentication
Drop external auth configuration from config.ini and move
implementation into a single backend provider named
'autologin'. This provider can strip realm names from
username with a custom regexp.

fixes #6081
2014-06-03 17:59:22 +02:00
Marius Hein a0459d0172 ExternalAuthentication: Move authenticationMode to config.ini
fixes #6214
2014-06-03 15:26:15 +02:00
Marius Hein 9b5c704da8 Puppet/Icinga2: Fix installation for Icinga2-2.0.0beta2 2014-06-03 14:44:13 +02:00
Marius Hein 160a95e32d Bootstrap/Web: Only load authentication.ini if needed
fixes #6238
2014-06-03 14:16:01 +02:00
Eric Lippmann 274fc58d0f Vagrant: Fix file permissions of mount.vboxsf
refs #5982
2014-06-03 13:17:07 +02:00
Eric Lippmann 02007cf9fb Vagrant: No longer remount the config/ directory
The virtual machine uses its own config files beneath /etc/icingaweb.
2014-06-03 13:11:28 +02:00
Eric Lippmann 473d986dfb Revert "Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf"
This reverts commit 3a25f019c5.

The "wrong" permissions do of course come from fmode=775 rather than dmode=775. I'm just blind.

refs #5982
2014-06-02 18:15:19 +02:00
Eric Lippmann cfcaf019bd User backends: Throw exception when authentication fails due to an exception
refs #5685
2014-06-02 15:52:58 +02:00
Eric Lippmann 086e2b6197 Auth: Log and notify user about authentication backend errors
refs #5685
2014-06-02 15:47:21 +02:00
Eric Lippmann 2274b6e11e lib: Add phpdoc to class `AuthChain'
refs #5685
2014-06-02 15:46:15 +02:00
Marius Hein 79fb8b1e0d Config: Remove base path subsitution
Test for leading slash and prepend base path to allow
absolute configuration files.

fixes #5556
2014-06-02 14:54:31 +02:00
Eric Lippmann 5559cf6c2b lib: Add AuthenticationException for exceptions thrown during authentication
Our user backends log exceptions thrown during authentication but they don't throw
a exception to inform the caller that an error occured. The new `AuthenticationException'
class should be thrown in that case.
2014-06-02 14:07:59 +02:00
Eric Lippmann ede403977a Auth: Get password from form only once
Before, the user's password was retrieved for every authentication
backend tried for authentication.
2014-06-02 14:04:45 +02:00
Eric Lippmann a379502b15 Preferences: Rename `showBenchmark' to `show_benchmark'
We use underscore_case notation for all configuration keys.

refs #4952
2014-06-02 13:33:55 +02:00
Eric Lippmann 93829bde92 config.ini: Fix indents 2014-06-02 13:33:17 +02:00
Eric Lippmann 50e01d1284 Config: Rename `configPath' to `config_path'
We use underscore_case notation for all configuration keys.

refs #4952
2014-06-02 12:09:16 +02:00
Eric Lippmann 3a25f019c5 Vagrant/finalize.sh: Remove dmode and fmode options from mount.vboxsf
The dmode and fmode options seem to set the execute bit even when the mode is 775.

refs #5982
2014-06-02 10:47:44 +02:00
Eric Lippmann 1619d682c7 vendor: Remove executeable bit from a read me file of HTMLPurifier
refs #5982
2014-06-02 10:45:30 +02:00
Michael Friedrich 31f4c9b1b2 Require at least Vagrant 1.2.x in Vagrantfile
Users don't read READMEs or documentation, they'll
just fire 'vagrant up'. Vagrant already checks the
Virtualbox version itself, but for the Vagrant version
no checks exist. Vagrant 1.4 provides a method 'require_version'
which is pretty useless for older versions, like on Debian
Wheezy (1.0.3). So we'll ship our own version comparison.

fixes #6366
2014-05-30 16:21:04 +02:00
Thomas Gelf 324a4c973d Translation: new time-related since/for strings
Updated German translation

refs #5981
2014-05-29 11:22:39 +00:00
Gunnar Beutner 5cc69b53cf Remove superfluous space in prefixedTimeSince
refs #5981
2014-05-29 13:11:01 +02:00
Thomas Gelf f767fb2de3 js/ui: rename timeunless to timeuntil
CSS filter adjusted to fit recent changes

refs #5981
2014-05-29 11:09:52 +00:00
Gunnar Beutner a66a1a4729 Refactor the timeSincePrefix and timeUntilPrefix functions
Instead of having two separate functions to get the prefix
and the formatted time interval the new functions return
both the prefix and the time interval.

refs #5981
2014-05-29 13:03:10 +02:00
Gunnar Beutner 7b0a48bef5 Rename timeUnless to timeUntil
refs #5981
2014-05-29 12:38:59 +02:00
Gunnar Beutner d01a98b7e6 Fix some of the time-related grammar mistakes
This updates some of the messages to use "For"
instead of "Since" where appropriate.

fixes #5981
2014-05-29 11:30:08 +02:00
Thomas Gelf e7e7ae72ba Encoding: decode encoded titles
Related to the last commit, forgot to decode titles
2014-05-28 21:39:34 +00:00
Thomas Gelf 88460189cd Encoding: no ASCII chars > 127 in HTTP headers
Had quite some trouble with this, decided to URL-encode titles and
notifications.
2014-05-28 21:34:36 +00:00
Ulf Lange b0b2d21751 icingaweb2.spec: Fixes for SLES 11
Refs #4075

Signed-off-by: Michael Friedrich <michael.friedrich@gmail.com>
2014-05-28 21:16:23 +02:00
Thomas Gelf cf6f1f8bf4 icinga/loader.js: play nice with invalid responses
Even responses with no HTML or no root node or similar must be rendered
successfully to their containers.
2014-05-28 15:59:42 +00:00
Thomas Gelf 5b24ed1a15 CLI/ModuleCommand: helpful message with no module
'icingacli module list' gave "There is no module installed" instead
of "There is no enabled module". Fixed this, the former message is
still shown when doing 'icingacli module list installed'.
2014-05-28 11:45:58 +00:00
Thomas Gelf d10b4c5e93 Translation: a few more German strings
Especially search suggestions

refs #6340
2014-05-28 11:16:11 +00:00
Thomas Gelf f7c5119424 Search: split result and search hint
There was an ugly if/else in the view script, this patch creates two
of them and adds friendlier search suggestions.
2014-05-28 11:13:41 +00:00
Thomas Gelf 92f454c36d Chart\InlinePie: locale-ignorant casts for floats
PHP respects locales (LC_NUMERIC) when casting floats to string. That
affected the generated HTML for our inline pie charts. This patch is
not that beautiful - but fixes this.

fixes #6348
2014-05-28 10:20:34 +00:00
Thomas Gelf 7a0173e2fb monitoring/IdoQuery:
IDO version is cached in a session namespace. This fails where you
are using multiple IDO backends with different versions. We still have
no backend-specific base class where we could handle this, so for now
I continue to do so in the IdoQuery.

This patch creates one namespace per Host/dbname combination.
2014-05-28 09:39:38 +00:00
Thomas Gelf f790e0c323 Translation: keep translation domain with partial
We should try to avoid partial and pass translation domain where forced
to use it.

refs #6338
2014-05-27 22:20:21 +00:00
Thomas Gelf 7b58134378 show/history: sorry, typo 2014-05-27 22:16:45 +00:00
Thomas Gelf b7d3f0e54c Translation: another global view helper
refs #6338
2014-05-27 22:15:19 +00:00