diff --git a/munin/defaults.yaml b/munin/defaults.yaml index 1b24bb3..4650178 100644 --- a/munin/defaults.yaml +++ b/munin/defaults.yaml @@ -15,6 +15,9 @@ munin_node: file_user: root file_group: root +net_ssleay: + package: perl-Net-SSLeay + munin_tls: private_key: /etc/munin/tls/key.pem certificate: /etc/munin/tls/crt.pem diff --git a/munin/map.jinja b/munin/map.jinja index 3c8f7dd..d009cb3 100644 --- a/munin/map.jinja +++ b/munin/map.jinja @@ -6,8 +6,6 @@ {## Set OS-specific values for each of the states ##} {% set munin_master_osmap = salt['grains.filter_by']({ - 'Debian': {}, - 'RedHat': {}, 'Arch': { 'cron_service': '/etc/systemd/system/munin-cron.service', 'cron_timer': '/etc/systemd/system/munin-cron.timer', @@ -23,8 +21,6 @@ }, grain='os_family') %} {% set munin_node_osmap = salt['grains.filter_by']({ - 'Debian': {}, - 'RedHat': {}, 'Arch': { 'plugin_target_dir': '/usr/lib/munin/plugins', }, @@ -44,22 +40,15 @@ 'Debian': { 'package': 'libnet-ssleay-perl', }, - 'RedHat': { - 'package': 'perl-Net-SSLeay', + 'Arch': { + 'package': 'perl-net-ssleay', }, 'Gentoo': { 'package': 'dev-perl/Net-SSLeay', }, - 'FreeBSD': { - 'package': 'perl-Net-SSLeay', - }, }, grain='os_family') %} {% set munin_tls_osmap = salt['grains.filter_by']({ - 'Debian': {}, - 'RedHat': {}, - 'Arch': {}, - 'Gentoo': {}, 'FreeBSD': { 'private_key': '/usr/local/etc/munin/tls/key.pem', 'certificate': '/usr/local/etc/munin/tls/crt.pem',