Made the formula actually work

This commit is contained in:
Gregory Ballantine 2017-11-02 09:14:49 -04:00
parent 0e018836f3
commit 735b19698e
2 changed files with 26 additions and 26 deletions

View File

@ -1,4 +0,0 @@
munin:
file_user: root
file_group: root

View File

@ -1,21 +1,24 @@
{## Start with defaults from defaults.sls ##} {% set munin_master = salt['grains.filter_by']({
{% import_yaml 'munin/defaults.yaml' as default_settings %}
{% set munin_master_settings = salt['grains.filter_by']({
'Debian': { 'Debian': {
'package': 'munin', 'package': 'munin',
'config': '/etc/munin/munin.conf', 'config': '/etc/munin/munin.conf',
'config_src': 'salt://munin/files/munin.conf', 'config_src': 'salt://munin/files/munin.conf',
'file_user': 'root',
'file_group': 'root',
}, },
'RedHat': { 'RedHat': {
'package': 'munin', 'package': 'munin',
'config': '/etc/munin/munin.conf', 'config': '/etc/munin/munin.conf',
'config_src': 'salt://munin/files/munin.conf', 'config_src': 'salt://munin/files/munin.conf',
'file_user': 'root',
'file_group': 'root',
}, },
'Suse': { 'Suse': {
'package': 'munin', 'package': 'munin',
'config': '/etc/munin/munin.conf', 'config': '/etc/munin/munin.conf',
'config_src': 'salt://munin/files/munin.conf', 'config_src': 'salt://munin/files/munin.conf',
'file_user': 'root',
'file_group': 'root',
}, },
'Arch': { 'Arch': {
'package': 'munin', 'package': 'munin',
@ -23,31 +26,34 @@
'config_src': 'salt://munin/files/munin.conf', 'config_src': 'salt://munin/files/munin.conf',
'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',
'file_user': 'root',
'file_group': 'root',
}, },
'Gentoo': { 'Gentoo': {
'package': 'net-analyzer/munin', 'package': 'net-analyzer/munin',
'config': '/etc/munin/munin.conf', 'config': '/etc/munin/munin.conf',
'config_src': 'salt://munin/files/munin.conf', 'config_src': 'salt://munin/files/munin.conf',
'file_user': 'root',
'file_group': 'root',
}, },
'FreeBSD': { 'FreeBSD': {
'package': 'munin-master', 'package': 'munin-master',
'config': '/usr/local/etc/munin/munin.conf', 'config': '/usr/local/etc/munin/munin.conf',
'config_src': 'salt://munin/files/munin.conf', 'config_src': 'salt://munin/files/munin.conf',
'file_user': 'root',
'file_group': 'wheel', 'file_group': 'wheel',
}, },
}, merge=salt['pillar.get']('munin:lookup:master')) %} }, merge=salt['pillar.get']('munin:lookup:master')) %}
{% set munin_master = default_settings.copy() %} {% set munin_node = salt['grains.filter_by']({
{% munin_master.update(munin_master_settings %}
{% set munin_node_settings = salt['grains.filter_by']({
'Debian': { 'Debian': {
'package': 'munin-node', 'package': 'munin-node',
'service': 'munin-node', 'service': 'munin-node',
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/share/munin/plugins', 'plugin_dir': '/usr/share/munin/plugins',
'file_user': 'root',
'file_group': 'root',
}, },
'RedHat': { 'RedHat': {
'package': 'munin-node', 'package': 'munin-node',
@ -55,6 +61,8 @@
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/share/munin/plugins', 'plugin_dir': '/usr/share/munin/plugins',
'file_user': 'root',
'file_group': 'root',
}, },
'Suse': { 'Suse': {
'package': 'munin-node', 'package': 'munin-node',
@ -62,6 +70,8 @@
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/share/munin/plugins', 'plugin_dir': '/usr/share/munin/plugins',
'file_user': 'root',
'file_group': 'root',
}, },
'Arch': { 'Arch': {
'package': 'munin-node', 'package': 'munin-node',
@ -69,6 +79,8 @@
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/lib/munin/plugins', 'plugin_dir': '/usr/lib/munin/plugins',
'file_user': 'root',
'file_group': 'root',
}, },
'Gentoo': { 'Gentoo': {
'package': 'net-analyzer/munin', 'package': 'net-analyzer/munin',
@ -76,6 +88,8 @@
'config': '/etc/munin/munin-node.conf', 'config': '/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/libexec/munin/plugins', 'plugin_dir': '/usr/libexec/munin/plugins',
'file_user': 'root',
'file_group': 'root',
}, },
'FreeBSD': { 'FreeBSD': {
'package': 'munin-node', 'package': 'munin-node',
@ -83,15 +97,12 @@
'config': '/usr/local/etc/munin/munin-node.conf', 'config': '/usr/local/etc/munin/munin-node.conf',
'config_src': 'salt://munin/files/munin-node.conf', 'config_src': 'salt://munin/files/munin-node.conf',
'plugin_dir': '/usr/local/etc/munin/plugins', 'plugin_dir': '/usr/local/etc/munin/plugins',
'file_user': 'root',
'file_group': 'wheel', 'file_group': 'wheel',
}, },
}, merge=salt['pillar.get']('munin:lookup:node')) %} }, merge=salt['pillar.get']('munin:lookup:node')) %}
{% set munin_node = default_settings.copy() %} {% set net_ssleay = salt['grains.filter_by']({
{% munin_node.update(munin_node_settings %}
{% set net_ssleay_settings = salt['grains.filter_by']({
'Debian': { 'Debian': {
'package': 'libnet-ssleay-perl', 'package': 'libnet-ssleay-perl',
}, },
@ -106,11 +117,7 @@
}, },
}, merge=salt['pillar.get']('net_ssleay:lookup')) %} }, merge=salt['pillar.get']('net_ssleay:lookup')) %}
{% set munin_ssleay = default_settings.copy() %} {% set munin_tls = salt['grains.filter_by']({
{% munin_ssleay.update(munin_ssleay_settings %}
{% set munin_tls_settings = salt['grains.filter_by']({
'Debian': { 'Debian': {
'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',
@ -133,6 +140,3 @@
}, },
}, merge=salt['pillar.get']('munin:lookup:tls')) %} }, merge=salt['pillar.get']('munin:lookup:tls')) %}
{% set munin_tls = default_settings.copy() %}
{% munin_tls.update(munin_tls_settings %}