tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SelfServiceSettingsForm: allow global_zones... 

...regardless of installation settings

fixes #1399
This commit is contained in:
Thomas Gelf 2018-02-26 10:49:51 +01:00
parent 1bff61eeb5
commit a9f5f2140b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
application/forms/SelfServiceSettingsForm.php
View File

@ -40,6 +40,21 @@ class SelfServiceSettingsForm extends DirectorForm
'value' => $settings->getStoredOrDefaultValue('self-service/transform_hostname')
]);
$this->addElement('extensibleSet', 'global_zones', [
'label' => $this->translate('Global Zones'),
'description' => $this->translate(
'To ensure downloaded packages are build by the Icinga Team'
. ' and not compromised by third parties, you will be able'
. ' to provide an array of SHA1 hashes here. In case you have'
. ' defined any hashses, the module will not continue with'
. ' updating / installing the Agent in case the SHA1 hash of'
. ' the downloaded MSI package is not matching one of the'
. ' provided hashes of this setting'
),
'multiOptions' => $this->enumGlobalZones(),
'value' => $settings->getStoredOrDefaultValue('self-service/global_zones'),
]);
$this->addElement('select', 'download_type', [
'label' => $this->translate('Installation Source'),
'description' => $this->translate(
@ -147,21 +162,6 @@ class SelfServiceSettingsForm extends DirectorForm
'value' => $hashes,
]);
$this->addElement('extensibleSet', 'global_zones', [
'label' => $this->translate('Global Zones'),
'description' => $this->translate(
'To ensure downloaded packages are build by the Icinga Team'
. ' and not compromised by third parties, you will be able'
. ' to provide an array of SHA1 hashes here. In case you have'
. ' defined any hashses, the module will not continue with'
. ' updating / installing the Agent in case the SHA1 hash of'
. ' the downloaded MSI package is not matching one of the'
. ' provided hashes of this setting'
),
'multiOptions' => $this->enumGlobalZones(),
'value' => $settings->getStoredOrDefaultValue('self-service/global_zones'),
]);
$this->addElement('text', 'icinga_service_user', [
'label' => $this->translate('Service User'),
'description' => $this->translate(