Commit 1eb5a58a authored by Markus Frosch's avatar Markus Frosch

Added use(nagios|icinga)config UCR values

parent 416e07fa
......@@ -31,10 +31,30 @@ cfg_dir=/etc/nagios-plugins/config
# Hint: Check the docs/wiki on how to monitor remote hosts with different
# transport methods and plugins
@!@
if baseConfig.has_key('icinga/server/usenagiosobjects') and baseConfig['icinga/server/usenagiosobjects'] == 'yes':
print '# enabled by UCR icinga/server/usenagiosobjects'
print 'cfg_dir=/etc/nagios3/conf.univention.d'
print 'cfg_dir=/etc/nagios3/conf.local.d'
else:
print '# disabled by UCR icinga/server/usenagiosobjects'
print '#cfg_dir=/etc/nagios3/conf.univention.d'
print '#cfg_dir=/etc/nagios3/conf.local.d'
@!@
#
# Debian uses by default a configuration directory where icinga-common,
# other packages and the local admin can dump or link configuration
# files into.
cfg_dir=/etc/icinga/objects/
@!@
if baseConfig.has_key('icinga/server/useicingaobjects') and baseConfig['icinga/server/useicingaobjects'] == 'yes':
print '# enabled by UCR icinga/server/useicingaobjects'
print 'cfg_dir=/etc/icinga/objects/'
else:
print '# disabled by UCR icinga/server/useicingaobjects'
print '#cfg_dir=/etc/icinga/objects/'
@!@
# Definitions for ido2db process checks
#cfg_file=/etc/icinga/objects/ido2db_check_proc.cfg
......
......@@ -34,6 +34,8 @@ eval "$(univention-config-registry shell ldap/hostdn ldap/base server/role hostn
# set default baseconfig settings
univention-config-registry set 'icinga/server/refreshrate?90' \
'icinga/server/authenticate?yes' \
'icinga/server/usenagiosobjects?no' \
'icinga/server/useicingaobjects?yes' \
'icinga/server/user/systeminfo?*' \
'icinga/server/user/configinfo?*' \
'icinga/server/user/systemcmd?*' \
......
......@@ -15,6 +15,8 @@ Variables: icinga/server/user/allcmd
Type: file
File: etc/icinga/icinga.cfg
Variables: icinga/server/checkexternalcmd
Variables: icinga/server/usenagiosobjects
Variables: icinga/server/useicingaobjects
Type: file
File: etc/init.d/icinga
......
......@@ -10,6 +10,18 @@ Description[en]=Enable/Disable authentication for the Icinga web frontend
Type=str
Categories=service-icinga
[icinga/server/usenagiosobjects]
Description[de]=Aktiviere/Deaktiviere das Einbinden der Nagios Objekte (/etc/nagios3/conf.(univention|local).d)
Description[en]=Enable/Disable the inclusion of Nagios config objects (/etc/nagios3/conf.(univention|local).d)
Type=str
Categories=service-icinga
[icinga/server/useicingaobjects]
Description[de]=Aktiviere/Deaktiviere das Einbinden der Icinga Objekte (/etc/icinga/objects)
Description[en]=Enable/Disable the inclusion of Icinga config objects (/etc/icinga/objects)
Type=str
Categories=service-icinga
[icinga/server/checkexternalcmd]
Description[de]=Aktiviere/Deaktiviere das Übergeben von Kommandos aus dem Webfrontend
Description[en]=Enable/Disable the ability to run commands through the web frontend
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment