mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-04-08 17:15:08 +02:00
Merge branch 'Icinga:master' into master
This commit is contained in:
Korbinian Rosenegger
GitHub
commit
05e01d06ee
1
AUTHORS
1
AUTHORS
@ -130,6 +130,7 @@ Sylph Lin <sylph.lin@gmail.com>
|
||||
tfylling <torbfylling@gmail.com>
|
||||
Thomas Gelf <thomas.gelf@icinga.com>
|
||||
Tim Helfensdörfer <tim@visualappeal.de>
|
||||
Timm Ortloff <timm.ortloff@icinga.com>
|
||||
Tobias von der Krone <tobias.vonderkrone@profitbricks.com>
|
||||
Tomas Barton <barton.tomas@gmail.com>
|
||||
Tom Ford <exptom@users.noreply.github.com>
|
||||
|
||||
10
CHANGELOG.md
10
CHANGELOG.md
@ -4,6 +4,16 @@ Please make sure to always read our [Upgrading](doc/80-Upgrading.md) documentati
|
||||
|
||||
## What's New
|
||||
|
||||
### What's New in Version 2.11.4
|
||||
|
||||
You can find all issues related to this release on our [Roadmap](https://github.com/Icinga/icingaweb2/milestone/78?closed=1).
|
||||
|
||||
#### Notable Fixes
|
||||
|
||||
* Add/Edit dashlet not possible [#4970](https://github.com/Icinga/icingaweb2/issues/4970)
|
||||
* Custom library path + custom library, without slash in its name, results in exception [#4971](https://github.com/Icinga/icingaweb2/issues/4971)
|
||||
* Reflected XSS vulnerability in User Backends config page [#4979](https://github.com/Icinga/icingaweb2/issues/4979)
|
||||
|
||||
### What's New in Version 2.11.3
|
||||
|
||||
**Notice**: This is a security release. It is recommended to upgrade immediately.
|
||||
|
||||
@ -30,6 +30,8 @@ class LoggingConfigForm extends Form
|
||||
*/
|
||||
public function createElements(array $formData)
|
||||
{
|
||||
$defaultType = getenv('ICINGAWEB_OFFICIAL_DOCKER_IMAGE') ? 'php' : 'syslog';
|
||||
|
||||
$this->addElement(
|
||||
'select',
|
||||
'logging_log',
|
||||
@ -38,6 +40,7 @@ class LoggingConfigForm extends Form
|
||||
'autosubmit' => true,
|
||||
'label' => $this->translate('Logging Type'),
|
||||
'description' => $this->translate('The type of logging to utilize.'),
|
||||
'value' => $defaultType,
|
||||
'multiOptions' => array(
|
||||
'syslog' => 'Syslog',
|
||||
'php' => $this->translate('Webserver Log', 'app.config.logging.type'),
|
||||
@ -94,7 +97,7 @@ class LoggingConfigForm extends Form
|
||||
)
|
||||
);
|
||||
|
||||
if (! isset($formData['logging_log']) || $formData['logging_log'] === 'syslog') {
|
||||
if ((isset($formData['logging_log']) ? $formData['logging_log'] : $defaultType) === 'syslog') {
|
||||
if (Platform::isWindows()) {
|
||||
/* @see https://secure.php.net/manual/en/function.openlog.php */
|
||||
$this->addElement(
|
||||
|
||||
@ -8,7 +8,7 @@ namespace Icinga\Application;
|
||||
*/
|
||||
class Version
|
||||
{
|
||||
const VERSION = '2.11.3';
|
||||
const VERSION = '2.11.4';
|
||||
|
||||
/**
|
||||
* Get the version of this instance of Icinga Web 2
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
Module: doc
|
||||
Version: 2.11.3
|
||||
Version: 2.11.4
|
||||
Description: Documentation module
|
||||
Extracts, shows and exports documentation for Icinga Web 2 and its modules.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Module: migrate
|
||||
Version: 2.11.3
|
||||
Version: 2.11.4
|
||||
Description: Migrate module
|
||||
This module was introduced with the domain-aware authentication feature in version 2.5.0.
|
||||
It helps you migrating users and user configurations according to a given domain.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Module: monitoring
|
||||
Version: 2.11.3
|
||||
Version: 2.11.4
|
||||
Description: Icinga monitoring module
|
||||
IDO accessor and UI for your monitoring. This is the initial instalment for a
|
||||
graphical presentation of Icinga environments. The predecessor of Icinga DB.
|
||||
|
||||
@ -11,6 +11,8 @@ $setupTokenPath = rtrim($configDir, '/') . '/setup.token';
|
||||
$cliPath = realpath(Icinga::app()->getApplicationDir() . '/../bin/icingacli');
|
||||
|
||||
$groupadd = null;
|
||||
$docker = getenv('ICINGAWEB_OFFICIAL_DOCKER_IMAGE');
|
||||
|
||||
if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')) {
|
||||
foreach (array(
|
||||
'groupadd -r icingaweb2' => array(
|
||||
@ -79,6 +81,7 @@ if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')
|
||||
'To run this wizard a user needs to authenticate using a token which is usually'
|
||||
. ' provided to him by an administrator who\'d followed the instructions below.'
|
||||
); ?></p>
|
||||
<?php if (! $docker): ?>
|
||||
<p><?= $this->translate('In any case, make sure that all of the following applies to your environment:'); ?></p>
|
||||
<ul>
|
||||
<li><?= $this->translate('A system group called "icingaweb2" exists'); ?></li>
|
||||
@ -95,14 +98,19 @@ if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')
|
||||
</div>
|
||||
<?php } ?>
|
||||
<p><?= $this->translate('If you\'ve got the IcingaCLI installed you can do the following:'); ?></p>
|
||||
<?php endif; ?>
|
||||
<div class="code">
|
||||
<?php if (! $docker): ?>
|
||||
<span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup config directory --group icingaweb2<?= $configDir !== '/etc/icingaweb2' ? ' --config ' . $configDir : ''; ?>;</span>
|
||||
<?php endif; ?>
|
||||
<span><?= $cliPath ? $cliPath : 'icingacli'; ?> setup token create;</span>
|
||||
</div>
|
||||
<?php if (! $docker): ?>
|
||||
<p><?= $this->translate('In case the IcingaCLI is missing you can create the token manually:'); ?></p>
|
||||
<div class="code">
|
||||
<span>su <?= $phpUser ?: $this->translate('<your-webserver-user>'); ?> -s /bin/sh -c "mkdir -m 2770 <?= dirname($setupTokenPath); ?>; chgrp icingaweb2 <?= dirname($setupTokenPath); ?>; head -c 12 /dev/urandom | base64 | tee <?= $setupTokenPath; ?>; chmod 0660 <?= $setupTokenPath; ?>;";</span>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<p><?= sprintf(
|
||||
$this->translate('Please see the %s for an extensive description on how to access and use this wizard.'),
|
||||
'<a href="http://docs.icinga.com/">' . $this->translate('Icinga Web 2 documentation') . '</a>' // TODO: Add link to iw2 docs which points to the installation topic
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Module: setup
|
||||
Version: 2.11.3
|
||||
Version: 2.11.4
|
||||
Description: Setup module
|
||||
Web based wizard for setting up Icinga Web 2 and its modules.
|
||||
This includes the data backends (e.g. relational database, LDAP),
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Module: test
|
||||
Version: 2.11.3
|
||||
Version: 2.11.4
|
||||
Description: Translation module
|
||||
This module allows developers to run (unit) tests against Icinga Web 2 and
|
||||
any of its modules. Usually you do not need to enable this.
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
Module: translation
|
||||
Version: 2.11.3
|
||||
Version: 2.11.4
|
||||
Description: Translation module
|
||||
This module allows developers and translators to translate modules for multiple
|
||||
languages. You do not need this module to run an internationalized web frontend.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user