Commit Graph

2172 Commits

Author SHA1 Message Date
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 
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 
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 
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 
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 
2014-06-03 17:59:22 +02:00
Marius Hein a0459d0172 ExternalAuthentication: Move authenticationMode to config.ini
fixes 
2014-06-03 15:26:15 +02:00
Eric Lippmann d5cf2f2472 doc: Implement `DocParser::getToc()'
refs 
2014-06-03 15:23:59 +02:00
Eric Lippmann ed8de18ad5 DocParser: Use first header in a file as section title
refs 
2014-06-03 14:56:44 +02:00
Eric Lippmann 370bfca6e6 DocParser: Remove itemPriority since it's nowhere used
refs 
2014-06-03 14:53:28 +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 
2014-06-03 14:16:01 +02:00
Eric Lippmann 274fc58d0f Vagrant: Fix file permissions of mount.vboxsf
refs 
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 
2014-06-02 18:15:19 +02:00
Eric Lippmann cfcaf019bd User backends: Throw exception when authentication fails due to an exception
refs 
2014-06-02 15:52:58 +02:00
Eric Lippmann 086e2b6197 Auth: Log and notify user about authentication backend errors
refs 
2014-06-02 15:47:21 +02:00
Eric Lippmann 2274b6e11e lib: Add phpdoc to class `AuthChain'
refs 
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 
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 
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 
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 
2014-06-02 10:47:44 +02:00
Eric Lippmann 1619d682c7 vendor: Remove executeable bit from a read me file of HTMLPurifier
refs 
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 
2014-05-30 16:21:04 +02:00
Thomas Gelf 324a4c973d Translation: new time-related since/for strings
Updated German translation

refs 
2014-05-29 11:22:39 +00:00
Gunnar Beutner 5cc69b53cf Remove superfluous space in prefixedTimeSince
refs 
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 
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 
2014-05-29 13:03:10 +02:00
Gunnar Beutner 7b0a48bef5 Rename timeUnless to timeUntil
refs 
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 
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 

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
Eric Lippmann 0f1983fb25 doc: Fix links in index view scripts
refs 
2014-05-28 17:24:28 +02:00
Eric Lippmann 49e927c4bf doc: Support `doc/module/:moduleName/toc' URLs
refs 
2014-05-28 17:19:48 +02:00
Eric Lippmann dc1bada56f doc: Add a view script for module's doc toc
refs 
2014-05-28 17:19:24 +02:00
Eric Lippmann 72ab5027b5 doc: Add view script for the toc of Icinga Web 2's doc
refs 
2014-05-28 17:18:57 +02:00
Eric Lippmann d3a9f17fc2 doc/parser: Return the DocTocHtmlRenderer instead of an array
refs 
2014-05-28 17:18:07 +02:00
Eric Lippmann 2f1303a13b doc: No longer use a partial for viewing a toc
refs 
2014-05-28 17:16:37 +02:00
Eric Lippmann f0b6a3557e doc/lib: Add DocTocHtmlRenderer class to render a toc to HTML
refs 
2014-05-28 17:15:43 +02:00
Eric Lippmann d2936d0338 doc/lib: Add DocToc class representing a toc
refs 
2014-05-28 17:15:08 +02:00
Eric Lippmann 9edaaa82e8 lib: Add TreeIterator 2014-05-28 17:14:33 +02:00
Eric Lippmann 040473f986 lib: Add NodeInterface 2014-05-28 17:13:42 +02: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
Eric Lippmann b11c0c36f9 Doc: Support `doc/icingaweb/chapter/:chapterName' URLs
refs 
2014-05-28 13:34:39 +02:00
Eric Lippmann 0f4d2ad80c Doc: Support `doc/module/:moduleName/chapter/:chapterName' URLs
refs 
2014-05-28 13:33:07 +02:00
Eric Lippmann c12c4a9e4c Modules: Call `Module::registerWebIntegration()' after including the run script
Routes added via a module's run script were not respected since
`Module::registerRoutes()' is called from `Module::registerWebIntegration()'.

refs 
2014-05-28 13:29:02 +02:00