From 0846ae41e30a90d5c38b1551959c67fdf69cf892 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Tue, 14 Feb 2017 12:52:25 +0100 Subject: [PATCH] Rename state identifiers Just for cosmetics --- logrotate/config.sls | 4 ++-- logrotate/jobs.sls | 4 ++-- logrotate/service.sls | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/logrotate/config.sls b/logrotate/config.sls index 367666e..f882de8 100644 --- a/logrotate/config.sls +++ b/logrotate/config.sls @@ -3,7 +3,7 @@ include: - logrotate -logrotate_config: +logrotate-config: file.managed: - name: {{ logrotate.conf_file }} - source: salt://logrotate/files/{{ salt['grains.get']('os_family') }}/logrotate.conf @@ -12,7 +12,7 @@ logrotate_config: - group: {{ salt['pillar.get']('logrotate:config:group', logrotate.group) }} - mode: {{ salt['pillar.get']('logrotate:config:mode', '644') }} -logrotate_directory: +logrotate-directory: file.directory: - name: {{ logrotate.include_dir }} - user: {{ salt['pillar.get']('logrotate:config:user', logrotate.user) }} diff --git a/logrotate/jobs.sls b/logrotate/jobs.sls index 2b050bf..eb2b9ab 100644 --- a/logrotate/jobs.sls +++ b/logrotate/jobs.sls @@ -5,8 +5,8 @@ include: - logrotate -{% for key,value in jobs.items() %} -logrotate_{{key}}: +{% for key, value in jobs.items() %} +logrotate-{{ key }}: file.managed: - name: {{ logrotate.include_dir }}/{{ key.split("/")[-1] }} - source: salt://logrotate/templates/job.tmpl diff --git a/logrotate/service.sls b/logrotate/service.sls index ae8a788..1dbb774 100644 --- a/logrotate/service.sls +++ b/logrotate/service.sls @@ -13,5 +13,5 @@ logrotate: - enable: True - require: - pkg: logrotate-pkg - - file: logrotate_config - - file: logrotate_directory + - file: logrotate-config + - file: logrotate-directory