diff --git a/bundles/icinga2/files/features/mainlog.conf b/bundles/icinga2/files/features/mainlog.conf new file mode 100644 index 0000000..1a56d26 --- /dev/null +++ b/bundles/icinga2/files/features/mainlog.conf @@ -0,0 +1,4 @@ +/** + * This file is requires for inital apt install. + * The JournaldLogger type writes log information to the systemd journal. + */ diff --git a/bundles/icinga2/items.py b/bundles/icinga2/items.py index 8fb91f4..861dc1f 100644 --- a/bundles/icinga2/items.py +++ b/bundles/icinga2/items.py @@ -10,6 +10,24 @@ directories = { 'svc_systemd:icinga2.service:restart', ], }, + '/etc/icinga2/pki': { # required for apt install + 'purge': True, + 'owner': 'nagios', + 'group': 'nagios', + 'mode': '0750', + 'triggers': [ + 'svc_systemd:icinga2.service:restart', + ], + }, + '/etc/icinga2/zones.d': { # required for apt install + 'purge': True, + 'owner': 'nagios', + 'group': 'nagios', + 'mode': '0750', + 'triggers': [ + 'svc_systemd:icinga2.service:restart', + ], + }, '/etc/icinga2/conf.d': { 'purge': True, 'owner': 'nagios', @@ -195,7 +213,8 @@ files = { # FEATURES for feature, context in { - 'journald': {}, + 'mainlog': {}, +# 'journald': {}, FIXME 'notification': {}, 'checker': {}, 'api': {}, diff --git a/bundles/icinga2/metadata.py b/bundles/icinga2/metadata.py index 58ef786..7e58d3f 100644 --- a/bundles/icinga2/metadata.py +++ b/bundles/icinga2/metadata.py @@ -49,7 +49,6 @@ defaults = { 'mountpoint': '/var/lib/icinga2', 'needed_by': { 'pkg_apt:icinga2', - 'pkg_apt:icingaweb2', 'pkg_apt:icinga2-ido-pgsql', }, },