saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Logrotate module.

Browse source 
There is an issue reported #31137 where current logrotate module
create a .bak file, when using it. This will break logrotate since .bak
file will be left in /etc/logrotate.d directory.
At the same time and as a consecuence of fixing this, file.psed was
replace with file.replace since psed is deprecated since long time.

Fixes #31137.
This commit is contained in:
abednarik 2016-02-20 22:14:06 -03:00
parent 174ee10fc2
commit c1e0ff7785
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/modules/logrotate.py
View file

@ -162,9 +162,11 @@ def set_(key, value, setting=None, conf_file=default_conf):
log.debug(stanza)
log.debug(new_line)
log.debug(key)
__salt__['file.psed'](conf_file,
'{0}.*{{.*}}'.format(key),
new_line)
__salt__['file.replace'](conf_file,
'{0}.*{{.*}}'.format(key),
new_line,
flags=24,
backup=False)
else:
# This is the new config line that will be set
if value == 'True':
@ -177,10 +179,11 @@ def set_(key, value, setting=None, conf_file=default_conf):
log.debug(conf_file)
log.debug(key)
log.debug(new_line)
__salt__['file.psed'](conf_file,
'^{0}.*'.format(key),
new_line,
flags='gM')
__salt__['file.replace'](conf_file,
'^{0}.*'.format(key),
new_line,
flags=8,
backup=False)
def _dict_to_stanza(key, stanza):