1
0
Fork 0
mirror of synced 2024-12-29 01:13:23 -05:00

Merge pull request from mgomersbach/move-to-os-yaml-files

Move os_family and os mapping to yaml files
This commit is contained in:
Niels Abspoel 2018-10-15 19:39:54 +02:00 committed by GitHub
commit 6f6ffe871c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 46 deletions

View file

@ -2,52 +2,23 @@
# vim: ft=jinja # vim: ft=jinja
{% import_yaml 'logrotate/defaults.yaml' as default_settings %} {% import_yaml 'logrotate/defaults.yaml' as default_settings %}
{% import_yaml "logrotate/osfamilymap.yaml" as os_family_map %}
{% import_yaml "logrotate/osmap.yaml" as os_map %}
{% set os_family_map = salt['grains.filter_by']({ {% set osfam = salt['grains.filter_by'](
'Arch': { os_family_map,
'service': 'logrotate.timer', grain='os_family',
'default_config': { ) or {} %}
'tabooext': '+ .pacorig .pacnew .pacsave', {% set os = salt['grains.filter_by'](
}, os_map,
}, grain='os',
'Debian': { ) or {} %}
'default_config': {
'compress': True,
},
},
'RedHat': {
'service': 'crond',
'default_config': {
'dateext': True,
},
},
'Suse': {
'login_records_jobs': False,
'default_config': {
'dateext': True,
'compresscmd': '/usr/bin/xz',
'uncompresscmd': '/usr/bin/xzdec',
},
},
},
grain="os_family",
merge=salt['pillar.get']('logrotate:lookup')) or {}
%}
{% set os_map = salt['grains.filter_by']({ {% do salt['defaults.merge'](default_settings['logrotate'], osfam) %}
'Ubuntu': { {% do salt['defaults.merge'](default_settings['logrotate'], os) %}
'default_config': {
'su': 'root syslog'
},
},
},
grain="os",
merge=os_family_map) or {}
%}
{% set logrotate = salt['grains.filter_by']( {% set logrotate = salt['pillar.get'](
default_settings, 'logrotate:lookup',
merge=os_map, default=default_settings['logrotate'],
base='logrotate', merge=True,
) ) %}
%}

View file

@ -0,0 +1,27 @@
Arch:
service: logrotate.timer
default_config:
tabooext: + .pacorig .pacnew .pacsave
Debian:
default_config:
compress: True
RedHat:
service: crond
default_config:
dateext: True
Suse:
login_records_jobs: False
default_config:
dateext: True
compresscmd: /usr/bin/xz
uncompresscmd: /usr/bin/xzdec
Gentoo:
pkg: app-admin/logrotate
service: cronie
default_config:
tabooext: + .keep
dateext: True
FreeBSD:
conf_file: /usr/local/etc/logrotate.conf
include_dir: /usr/local/etc/logrotate.d
group: wheel

3
logrotate/osmap.yaml Normal file
View file

@ -0,0 +1,3 @@
Ubuntu:
default_config:
su: root syslog