Salt-Formulas/munin-formula
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleaned up map.jinja some more

Browse Source
This commit is contained in:
Gregory Ballantine 2018-03-31 23:32:11 -04:00
parent 6ea7f4867a
commit 153273cd56
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
munin/defaults.yaml
View File

@ -15,6 +15,9 @@ munin_node:
file_user: root file_user: root
file_group: root file_group: root
net_ssleay:
package: perl-Net-SSLeay
munin_tls: munin_tls:
private_key: /etc/munin/tls/key.pem private_key: /etc/munin/tls/key.pem
certificate: /etc/munin/tls/crt.pem certificate: /etc/munin/tls/crt.pem

15
munin/map.jinja
View File

@ -6,8 +6,6 @@
{## Set OS-specific values for each of the states ##} {## Set OS-specific values for each of the states ##}
{% set munin_master_osmap = salt['grains.filter_by']({ {% set munin_master_osmap = salt['grains.filter_by']({
'Debian': {},
'RedHat': {},
'Arch': { 'Arch': {
'cron_service': '/etc/systemd/system/munin-cron.service', 'cron_service': '/etc/systemd/system/munin-cron.service',
'cron_timer': '/etc/systemd/system/munin-cron.timer', 'cron_timer': '/etc/systemd/system/munin-cron.timer',
@ -23,8 +21,6 @@
}, grain='os_family') %} }, grain='os_family') %}
{% set munin_node_osmap = salt['grains.filter_by']({ {% set munin_node_osmap = salt['grains.filter_by']({
'Debian': {},
'RedHat': {},
'Arch': { 'Arch': {
'plugin_target_dir': '/usr/lib/munin/plugins', 'plugin_target_dir': '/usr/lib/munin/plugins',
}, },
@ -44,22 +40,15 @@
'Debian': { 'Debian': {
'package': 'libnet-ssleay-perl', 'package': 'libnet-ssleay-perl',
}, },
'RedHat': { 'Arch': {
'package': 'perl-Net-SSLeay', 'package': 'perl-net-ssleay',
}, },
'Gentoo': { 'Gentoo': {
'package': 'dev-perl/Net-SSLeay', 'package': 'dev-perl/Net-SSLeay',
}, },
'FreeBSD': {
'package': 'perl-Net-SSLeay',
},
}, grain='os_family') %} }, grain='os_family') %}
{% set munin_tls_osmap = salt['grains.filter_by']({ {% set munin_tls_osmap = salt['grains.filter_by']({
'Debian': {},
'RedHat': {},
'Arch': {},
'Gentoo': {},
'FreeBSD': { 'FreeBSD': {
'private_key': '/usr/local/etc/munin/tls/key.pem', 'private_key': '/usr/local/etc/munin/tls/key.pem',
'certificate': '/usr/local/etc/munin/tls/crt.pem', 'certificate': '/usr/local/etc/munin/tls/crt.pem',