From 1c6661a485384e6204f3037687ec13557261b686 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
Date: Tue, 14 Feb 2017 12:10:13 +0100
Subject: [PATCH] Move common settings to defaults.yaml

---
 logrotate/defaults.yaml | 11 ++++++++
 logrotate/map.jinja     | 62 ++++++++++++++---------------------------
 2 files changed, 32 insertions(+), 41 deletions(-)
 create mode 100644 logrotate/defaults.yaml

diff --git a/logrotate/defaults.yaml b/logrotate/defaults.yaml
new file mode 100644
index 0000000..7e2f163
--- /dev/null
+++ b/logrotate/defaults.yaml
@@ -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
+
diff --git a/logrotate/map.jinja b/logrotate/map.jinja
index 898c06b..fb0d288 100644
--- a/logrotate/map.jinja
+++ b/logrotate/map.jinja
@@ -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
+    )
+%}