Linux-Help/formula-logrotate
1
0
Fork 0
mirror of synced 2024-12-21 21:51:09 -05:00
Code Issues Releases Wiki Activity

Fix deep merge of settings

Browse source
This commit is contained in:
Gilles Dartiguelongue 2017-02-14 17:03:08 +01:00
parent 3676ff6216
commit 0ac29dd03f
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
logrotate/map.jinja
View file

@ -40,11 +40,9 @@
merge=os_family_map) or {} merge=os_family_map) or {}
%} %}
{% do default_settings.logrotate.update(os_map) %} {% set logrotate = salt['grains.filter_by'](
default_settings,
{% set logrotate = salt['pillar.get']( merge=os_map,
'logrotate', base='logrotate',
default=default_settings.logrotate,
merge=True
) )
%} %}