1
0
Fork 0

Move common settings to defaults.yaml

This commit is contained in:
Gilles Dartiguelongue 2017-02-14 12:10:13 +01:00
parent 084a1cfda5
commit 1c6661a485
2 changed files with 32 additions and 41 deletions

11
logrotate/defaults.yaml Normal file
View File

@ -0,0 +1,11 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
logrotate:
pkg: logrotate
conf_file: '/etc/logrotate.conf'
include_dir: '/etc/logrotate.d'
user: root
group: root
service: cron

View File

@ -1,42 +1,22 @@
{% set logrotate = salt['grains.filter_by']({
'RedHat': {
'pkg' : 'logrotate',
'service' : 'crond',
'conf_file' : '/etc/logrotate.conf',
'include_dir' : '/etc/logrotate.d',
'user' : 'root',
'group' : 'root',
# -*- coding: utf-8 -*-
# vim: ft=jinja
{% set os_family_map = salt['grains.filter_by']({
'RedHat': {
'service': 'crond',
},
'Arch': {
'service': 'logrotate.timer',
},
},
'ScientificLinux': {
'pkg' : 'logrotate',
'service' : 'crond',
'conf_file' : '/etc/logrotate.conf',
'include_dir' : '/etc/logrotate.d',
'user' : 'root',
'group' : 'root',
},
'Arch': {
'pkg' : 'logrotate',
'service' : 'logrotate.timer',
'conf_file' : '/etc/logrotate.conf',
'include_dir' : '/etc/logrotate.d',
'user' : 'root',
'group' : 'root',
},
'Debian': {
'pkg' : 'logrotate',
'service' : 'cron',
'conf_file' : '/etc/logrotate.conf',
'include_dir' : '/etc/logrotate.d',
'user' : 'root',
'group' : 'root',
},
'Suse': {
'pkg' : 'logrotate',
'service' : 'cron',
'conf_file' : '/etc/logrotate.conf',
'include_dir' : '/etc/logrotate.d',
'user' : 'root',
'group' : 'root',
},
}, merge=salt['pillar.get']('logrotate:lookup')) %}
grain="os_family",
merge=salt['pillar.get']('logrotate:lookup'))
{% do default_settings.logrotate.update(os_family_map) %}
{% set logrotate = salt['pillar.get'](
'logrotate',
default=default_settings.logrotate,
merge=True
)
%}