tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-09-21 17:07:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaHostGroup|IcingaService(Set): Fix legacy config file extension

Browse Source 
refs #13049
This commit is contained in:
Markus Frosch 2016-11-14 15:06:31 +01:00
parent fee8e7847d
commit d4c3be0bf5
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Director/Objects/IcingaHostGroup.php
View File

@ -88,7 +88,7 @@ class IcingaHostGroup extends IcingaObjectGroup
$zone = $this->connection->getDefaultGlobalZoneName(); $zone = $this->connection->getDefaultGlobalZoneName();
} }
return $config->configFile( return $config->configFile(
'director/' . $zone . '/hostgroups' 'director/' . $zone . '/hostgroups', '.cfg'
); );
} }

4
library/Director/Objects/IcingaService.php
View File

@ -210,8 +210,10 @@ class IcingaService extends IcingaObject
protected function legacyHostnameServicesFile($hostname, IcingaConfig $config) protected function legacyHostnameServicesFile($hostname, IcingaConfig $config)
{ {
$host = IcingaHost::load($hostname, $this->getConnection());
return $config->configFile( return $config->configFile(
'director/' . IcingaHost::load($hostname, $this->getConnection())->getRenderingZone($config) . '/service_apply' 'director/' . $host->getRenderingZone($config) . '/service_apply',
'.cfg'
); );
} }

7
library/Director/Objects/IcingaServiceSet.php
View File

@ -225,15 +225,18 @@ class IcingaServiceSet extends IcingaObject
protected function legacyHostnameServicesFile($hostname, IcingaConfig $config) protected function legacyHostnameServicesFile($hostname, IcingaConfig $config)
{ {
$host = IcingaHost::load($hostname, $this->getConnection());
return $config->configFile( return $config->configFile(
'director/' . IcingaHost::load($hostname, $this->getConnection())->getRenderingZone($config) . '/servicesets' 'director/' . $host->getRenderingZone($config) . '/servicesets',
'.cfg'
); );
} }
protected function legacyRelatedHostFile(IcingaService $service, IcingaConfig $config) protected function legacyRelatedHostFile(IcingaService $service, IcingaConfig $config)
{ {
return $config->configFile( return $config->configFile(
'director/' . $service->getRelated('host')->getRenderingZone($config) . '/servicesets' 'director/' . $service->getRelated('host')->getRenderingZone($config) . '/servicesets',
'.cfg'
); );
} }