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

IcingaConfig: start to re-add disabled zone elements

This commit is contained in:
Thomas Gelf 2015-11-14 14:49:45 +01:00
parent 4853eba4da
commit 76b45f04d5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Director/IcingaConfig/IcingaConfig.php
View File

@ -302,6 +302,7 @@ throw $e;
{
$class = 'Icinga\\Module\\Director\\Objects\\Icinga' . ucfirst($type);
$objects = $class::loadAll($this->connection);
$ourGlobalZone = 'director-global';
$file = null;
foreach ($objects as $object) {
@ -315,16 +316,14 @@ throw $e;
if ($type === 'zone') {
$this->zoneMap[$object->id] = $object->object_name;
$zone = 'global'; // which one?
} elseif ($object->hasProperty('zone_id') && ($zone_id = $object->zone_id)) {
$zone = $this->getZoneName($zone_id);
} else {
$zone = 'master';
}
if ($type === 'zone') {
$filename = 'conf.d/zones';
continue;
if (in_array($type, array('command', 'zone'))) {
$filename = 'zones.d/' . $ourGlobalZone . '/' . $filename;
} elseif ($type === 'endpoint') {
$filename = 'conf.d/endpoints';
continue;