Commit Graph

189 Commits

Author SHA1 Message Date
Johannes Meyer bc450c573d Refactor and fix requirement evaluation
refs #8508
2015-03-10 09:12:06 +01:00
Johannes Meyer e80786d63d Rename Requirements to RequirementSet
refs #8508
2015-03-09 09:05:56 +01:00
Johannes Meyer 4badbc660b Merge branch 'master' into feature/conditional-requirements-8508 2015-03-09 08:51:03 +01:00
Louis Sautier 003a9be43d Fix external authentication with nginx
fixes #8634

Signed-off-by: Gunnar Beutner <gunnar@beutner.name>
2015-03-08 15:32:34 +01:00
Johannes Meyer cddcde9494 Setup: Automatically check the respective admin account type selection
resolves #8603
2015-03-06 15:41:25 +01:00
Johannes Meyer 31560c9249 Wizard: Explain that the webserver user must be in the group "icingaweb2"
resolves #8491
2015-03-05 10:30:06 +01:00
Johannes Meyer 642fa44fce Move a form's title into the markup of its form 2015-03-03 09:53:25 +01:00
Johannes Meyer 2af83e7d72 Installation: Use native form title and description support where appropriate
refs #7947
refs #7976
2015-03-02 18:40:47 +01:00
Johannes Meyer d3f9bd633c Installation: Hide the required cue when choosing the preference backend
refs #7934
2015-03-02 18:40:46 +01:00
Johannes Meyer d714c4323c Installation: Remove required cue from the token input
refs #7934
2015-03-02 18:40:46 +01:00
Johannes Meyer e9bae08a6e Fix that one can't advance the wizard when skipping the ldap discovery
fixes #8506
2015-03-02 18:40:46 +01:00
Johannes Meyer d0a8dd8973 Requirements: Do not implement ArrayIterator but RecursiveIterator
refs #8508
2015-02-26 10:52:39 +01:00
Johannes Meyer 87fe9bd2ff Adjust the web wizard so that all database dependencies are grouped
refs #8508
2015-02-26 10:50:05 +01:00
Johannes Meyer 8ed4a943f7 Add support for nested requirement sets
This allows now to link requirements by an OR condition as well and to nest
such grouped requirements in other sets of type AND, and vice versa.

refs #8508
2015-02-26 10:49:03 +01:00
Johannes Meyer 04630a20be Implement all known requirements as object
refs #8508
2015-02-25 13:39:59 +01:00
Johannes Meyer 24d0999fa4 Register requirements as objects
This neutralizes the need for a unique name per requirement as
requirements are now compared based on their type and condition.
It also allows to implement a solution to add simple conditional
requirements.

refs #8508
2015-02-25 13:38:38 +01:00
Matthias Jentsch d4dc0177c0 Sort LDAP user list
fixes #7693
2015-02-24 12:50:57 +01:00
Johannes Meyer e6957967f9 Wizard: Add proper titles to the button-like links on the last page
refs #8458
2015-02-23 17:33:23 +01:00
Johannes Meyer 60a9d1f224 Wizard: Add proper title to the refresh button of the requirements page
refs #8458
2015-02-23 17:32:55 +01:00
Johannes Meyer 5321c2f9e5 Mute icons properly using the new automatic mechanisms of our view helpers
refs #8360
2015-02-16 10:52:42 +01:00
Johannes Meyer 437050430f Make sure that the admin wizard-step provides the required-HTML markup
refs #8349
2015-02-05 13:18:21 +01:00
Johannes Meyer a8e0b7effc Fix usage of the PostgreSQL system function has_database/table_privilege
On PostgreSQL < 8.4 the system functions has_database_privilege() and
has_table_privilege() do no support comma separated privilege types.

fixes #8354
2015-02-04 13:20:41 +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
Johannes Meyer b712d9453b It's not the "permissions.ini" but the "roles.ini" that holds the role settings 2015-02-03 16:38:32 +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 338d067aba.
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 c4c6d36b00 setup: Clarify that the db user's credentials may be insufficient as well 2015-02-02 16:55:31 +01:00
Johannes Meyer f5a651664c Create the enabledModules directory when necessary only as well
refs #8219
2015-01-30 16:16:12 +01:00
Johannes Meyer a95fd561cd Revert "setup: Convert octal directory mode to decimal notation"
This reverts commit e93e8f6330.
2015-01-30 15:47:21 +01:00
Johannes Meyer d2dd66c9fd Revert "setup: Fix octdec for directory modes"
This reverts commit c0444a81b2.
2015-01-30 15:47:11 +01:00
Johannes Meyer 6416fc421c Do not create directories which are created automatically if necessary
refs #8219
2015-01-30 15:43:39 +01:00
Johannes Meyer 63305fdf9a Add Icinga\Application\Config::saveIni()
Simplifies saving INI files. Icinga\File\Ini\IniWriter does already require an
instance of Icinga\Application\Config so it's obvious to give "Config" the
task to initialize the writer.. We do also have a central place to handle
creating missing ancestor directories now.

refs #8219
2015-01-30 09:32:08 +01:00
Johannes Meyer 78f5bf4f3d Phrase external auth warnings more neutral
refs #8274
2015-01-28 16:22:20 +01:00
Johannes Meyer 23c36898da Rename css class "info" to "info-box" and add it as generic box
refs #8274
2015-01-27 14:05:41 +01:00
Johannes Meyer afd4a9a134 There will be '.. users create' instead of '.. setup config webserver --with..'
refs #8274
2015-01-27 10:54:33 +01:00
Johannes Meyer 50fc85d7ff Rename authentication type "autologin" to "external"
refs #8274
2015-01-27 09:49:36 +01:00
Johannes Meyer 0fa133abfb setup: Display a note in case autologin is chosen while not being logged in
In case the user chooses to use autologin as authentication while not being
externally authenticated a note is displayed indicating that it is necessary
to set up the webserver's authentication to be able to login once the wizard
is complete.

refs #8274
2015-01-26 16:58:40 +01:00
Johannes Meyer 45408e45af Relax database permission checks in the setup wizard
The wizard considered all permissions being exclusively associated to their
most important context, which is, in the most common case, incorrect.
Permissions assigned on database level do not need to be assigned on
table level as well.

refs #8267
2015-01-26 15:51:47 +01:00
Johannes Meyer 7006bbf8b2 Suggest "icingaweb2" as group instead of the webserver's user
..and note that it is necessary to create this group.
2015-01-26 14:13:10 +01:00
Johannes Meyer 0b73dbdd6d Fix exception "Undefined index: type" in the WebWizard's page logic
refs #8275
2015-01-26 10:32:33 +01:00
Johannes Meyer fb97e74453 Use the correct element identifier for the preference storage type selection
Used to be `type' but has changed to `store'
to get a more clear INI structure.

fixes #8275
2015-01-26 07:39:31 +01:00
Johannes Meyer 359336243c Save "none" instead of "null" when choosing to not to store preferences
refs #8234
2015-01-23 16:25:24 +01:00
Johannes Meyer 2a543bb5ae Rename the preference setting `type' to `store'
refs #8234
2015-01-23 16:25:23 +01:00
Johannes Meyer 14a4aaeb77 Revert "Fix that when chosing to not to store preferences an invalid config is created"
This reverts commit 6284da451e.
2015-01-23 15:23:43 +01:00
Johannes Meyer 6284da451e Fix that when chosing to not to store preferences an invalid config is created
fixes #8234
2015-01-23 14:42:09 +01:00
Johannes Meyer 3040116c12 Combine duplicate requirements
refs #8191
2015-01-22 12:47:18 +01:00
Johannes Meyer c4c248cbb7 Make the ModulePage's design more appealing
refs #8191
2015-01-22 10:57:41 +01:00
Johannes Meyer 1ee873adfc Remove the "old" ModulePage view script
refs #8191
2015-01-21 17:00:30 +01:00
Johannes Meyer 71fd1036de Pre-select the monitoring module in the setup wizard
It's TEH module!!1

refs #8191
2015-01-21 16:57:08 +01:00
Johannes Meyer 913143f3a8 Update the SummaryPage's description
A summary page isn't an indicator anymore for a complete wizard as
there are multiple summary pages now.

refs #8191
2015-01-21 16:52:38 +01:00
Johannes Meyer 96390d34bf Enable modules as part of the main installation routine
refs #8191
2015-01-21 15:03:34 +01:00
Johannes Meyer 817e4e937c Run module wizards as part of the main application's wizard
A user now chooses right after the start which modules to install and
configures them as part of the main routine.

refs #8191
2015-01-21 14:00:57 +01:00
Johannes Meyer 08e600a376 Re-introduce the ModulePage
Now with pretty checkboxes :)

refs #8191
2015-01-21 13:57:59 +01:00
Johannes Meyer 1f6a81aefb Add Wizard::skipPage()
Required to not to duplicate code in custom wizards and to avoid errors
when detecting the direction.

refs #8191
2015-01-21 13:07:08 +01:00
Johannes Meyer 573c1046bb Ensure that the SummaryPage has a unique name when being utilized
refs #8191
2015-01-21 11:44:44 +01:00
Johannes Meyer fdb3988efd Fix float formatting in the progress bar's css
refs #8191
2015-01-21 11:15:38 +01:00
Johannes Meyer b468be2813 Drop the ModulePage
refs #8191
2015-01-21 09:59:48 +01:00
Johannes Meyer 99699a14ad Replace all mt() calls with translate() in the setup module's view scripts 2015-01-20 17:39:47 +01:00
Johannes Meyer 095d9437b8 Adjust the wizard's progress bar
Moved the "Modules" step to the left and removed the "Summary" step.

refs #8191
2015-01-20 17:33:29 +01:00
Eric Lippmann c0444a81b2 setup: Fix octdec for directory modes
Modes prefixed w/ zero, e.g. 0775 require a string conversion before calling octdec.
2015-01-19 11:43:38 +01:00
Eric Lippmann 70f080313d setup: Use schema path from setup's config or default
refs #8232
2015-01-19 11:43:38 +01:00
Eric Lippmann ef412688e9 setup: Require to set a path to the schema files
refs #8232
2015-01-19 11:43:38 +01:00
Johannes Meyer 8c87a9df13 Replace t() and mt() with translate() in setup module's forms
refs #7551
2015-01-19 11:07:39 +01:00
Eric Lippmann e93e8f6330 setup: Convert octal directory mode to decimal notation
PHP's chmod sets wrong permissions when using 2770 as directory mode for example.

fixes #8233
2015-01-16 17:01:41 +01:00
Rene Moser 3961a44769 setup-welcome: fix cli doc
* `createDirectory` does not exist, this should be `direcotory`.
* For changing the group option `--group` must be used.
* Default config directory is `/etc/icingaweb2` not `/etc/icingaweb`.

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-01-13 13:04:04 +01:00
Eric Lippmann 80730e0bb2 cli/setup: Remove is_string checks for switches of the webserver generation 2014-12-30 18:49:47 +01:00
Eric Lippmann 9f545535a0 cli/setup: Issue nice error messages when creating the config directory fails 2014-12-30 16:03:05 +01:00
Eric Lippmann 865b5c126a cli/setup: Do not exit setup config directory when the directory already exists
mkdir may succeed but chmod or chgrp may fail. The next time the command is called
it will ll exit before trying to chmod or chgrp again because the directory already exists.
2014-12-30 15:56:42 +01:00
Eric Lippmann 90fb44122b cli/setup: Do not translate \n again 2014-12-30 15:55:14 +01:00
Eric Lippmann f9ca0296a4 cli/setup: Do not return false; after $this->fail()
$this-fail() throws an exception.
2014-12-30 15:54:07 +01:00
Eric Lippmann 9de1b20d3c cli/setup: Issue an error if chmod fails when setting up the configuration directory 2014-12-30 15:51:00 +01:00
Eric Lippmann 9c40372b61 cli/setup: Do not translate \n 2014-12-30 15:49:11 +01:00
Eric Lippmann 672500029c cli/setup: Add sanity check for the --mode switch when creating the config directory 2014-12-30 15:46:22 +01:00
Eric Lippmann d3dcf152fb setup: Do not use umask(0)
chmod is not affected in any way by the umask.
2014-12-30 15:40:06 +01:00
Eric Lippmann f84a9a6529 cli/setup: Do not use umask(0)
chmod is not affected in any way by the umask.
2014-12-30 15:33:01 +01:00
Eric Lippmann 082cdd6dd2 cli/setup: Rename --path switch to --config for the directory action
All other actions use --config too.
2014-12-30 15:24:31 +01:00
Eric Lippmann bad7aad05e cli/setup: Do not use the webserver user's group but 'icingaweb2' 2014-12-30 15:22:53 +01:00
Eric Lippmann 861252b1e7 setup: Rename createDirectory to diretory
'icingacli setup config directory' does not suffer from camel case notation and explains
pretty much what it does.
2014-12-30 14:59:23 +01:00
Eric Lippmann 4b6ea55cbb setup: Add --config switch to TokenCommand::createAction()
refs #7906
2014-12-30 14:55:44 +01:00
Eric Lippmann aea7b068da setup: Add --config switch to TokenCommand::showAction()
refs #7906
2014-12-30 14:43:19 +01:00
Eric Lippmann 2d69e44846 setup: Set default URL path to /icingaweb2 2014-12-30 14:42:42 +01:00
Eric Lippmann 60b74ddcec Cli: Fix parameter documentation for ConfigCommand::webserverAction()
We speak of icingaweb2 not icingaweb now.
2014-12-30 14:41:35 +01:00
Eric Lippmann 5e812c72f1 cli/webserver config: Fix --config sanity check 2014-12-30 14:37:34 +01:00
Eric Lippmann fc05f4d53e setup: Fix the mode of created directories 2014-12-29 17:55:34 +01:00
Eric Lippmann ff17c3729c setup: Use 'icingaweb2' as default authentication backend name 2014-12-29 16:06:34 +01:00
Eric Lippmann 2bd9d27e05 Do not validate the mode of the setup.token
Relying on the mode of the configuration directory must be sufficient.
2014-12-29 14:33:37 +01:00
Eric Lippmann daaf242145 Fix the default configuration path in our web wizard 2014-12-29 14:33:07 +01:00
Eric Lippmann 19387b24ab Do not use a new function for getting the configuration directory in our web wizard 2014-12-29 14:32:20 +01:00
Johannes Meyer 4c4c0c97a5 Fix incorrect token generation example on the wizard's welcome page
fixes #8135
2014-12-22 08:30:08 +01:00
Johannes Meyer cc9ee93311 Clarify that php-gd is mandatory to export views to PDF
refs #8112
2014-12-18 16:21:25 +01:00
Johannes Meyer bca28a5ae2 Display inline pie-charts also in views exported to PDF
fixes #6463
2014-12-15 13:55:20 +01:00
Johannes Meyer ebf908b1b5 Make db requirement checks more sensitive
fixes #7837
2014-12-01 15:38:10 +01:00
Johannes Meyer 2b2b28915d Fix granting privileges on a mysql host
In case current_user() reports a wildcard identification for the user's
host (e.g. user@%) the percent sign was not escaped causing sprintf
to complain as there were too few arguments in this case.

fixes #7853
2014-12-01 11:00:12 +01:00
Johannes Meyer ca1dafeec3 Add hint to the requirements page's refresh button to restart the webserver
fixes #7839
2014-11-26 10:42:44 +01:00
Johannes Meyer d25a3a1704 Show path to the php.ini on the wizard's requirements page
refs #7839
2014-11-26 10:38:39 +01:00
Johannes Meyer e82cc35043 Re-add a description to the setup wizard
If someone has a better alternative don't hesitate
to replace this with a valid description.

fixes #7836
2014-11-26 08:58:09 +01:00
Johannes Meyer ff19696429 Add --path argument to the setup's welcome page examples if necessary
refs #7581
2014-11-26 08:58:08 +01:00
Johannes Meyer a288535347 Use the `host' and `port' directives when using a zend adapter in DbTool
fixes #7781
fixes #7798
2014-11-25 16:03:06 +01:00
Johannes Meyer c288a68ed5 Merge branch 'master' into bugfix/drop-zend-config-7147
Conflicts:
	application/forms/LdapDiscoveryForm.php
2014-11-18 13:21:18 +01:00