summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2016-11-23 21:31:04 +0100
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2016-11-23 21:31:04 +0100
commit11a57fdb320a08729eb28162e2d3fcee8a2e8a2a (patch)
tree192fd1b72f2fa80c2cc0e1d06ed8ac8491206b83 /src
parent21c4b530ade19fb437b080e899ee8d06dfe88c82 (diff)
downloadbcfg2-11a57fdb320a08729eb28162e2d3fcee8a2e8a2a.tar.gz
bcfg2-11a57fdb320a08729eb28162e2d3fcee8a2e8a2a.tar.bz2
bcfg2-11a57fdb320a08729eb28162e2d3fcee8a2e8a2a.zip
Server/Plugins/NagiosGen: Always include default group
The default group file should be included, even if no server is in the 'default' hostgroup. It allows to include global definitions (like a service template). The behaviour is documented and was broken by 590a1314bca44f29fc34bd27f0d49599b7eeab10.
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/NagiosGen.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
index d3c38ef19..1584a5ab6 100644
--- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
+++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
@@ -92,7 +92,7 @@ class NagiosGen(Plugin, Generator):
for host in host_configs:
host_data.append(open(host, 'r').read())
- group_list = []
+ group_list = ['default']
for line in "\n".join(host_data).splitlines():
# only include those groups which are actually used
if "hostgroup" in line: