From 58b2d62222bc56ab633fc5f84d2a6391af3305b9 Mon Sep 17 00:00:00 2001
From: Pig Monkey <pm@pig-monkey.com>
Date: Sun, 27 Aug 2017 11:34:38 -0700
Subject: [PATCH] increase user log retention

---
 group_vars/all                    | 4 +++-
 roles/base/tasks/user.yml         | 6 +++---
 roles/base/templates/logrotate.j2 | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/group_vars/all b/group_vars/all
index 087f027..b0422a7 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -4,7 +4,9 @@ user:
     group: pigmonkey
     shell: /usr/bin/zsh
     email:  peter@havenaut.net
-    log_dir: log
+    log:
+        dir: log
+        rotate: 8
 
 hostname: nous
 
diff --git a/roles/base/tasks/user.yml b/roles/base/tasks/user.yml
index 9970589..7017660 100644
--- a/roles/base/tasks/user.yml
+++ b/roles/base/tasks/user.yml
@@ -10,13 +10,13 @@
     - user
 
 - name: Create user log dir
-  file: path=/home/{{ user.name }}/{{ user.log_dir }} state=directory owner={{ user.name }} group={{ user.group }}
-  when: user.log_dir is defined
+  file: path=/home/{{ user.name }}/{{ user.log.dir }} state=directory owner={{ user.name }} group={{ user.group }}
+  when: user.log.dir is defined
   tags:
     - user
 
 - name: Push logrotate config for user logs
   template: src=logrotate.j2 dest=/etc/logrotate.d/user
-  when: user.log_dir is defined
+  when: user.log.dir is defined
   tags:
     - user
diff --git a/roles/base/templates/logrotate.j2 b/roles/base/templates/logrotate.j2
index 71e7a44..7dadf38 100644
--- a/roles/base/templates/logrotate.j2
+++ b/roles/base/templates/logrotate.j2
@@ -1,6 +1,8 @@
 # {{ ansible_managed }}
 
-/home/{{ user.name }}/{{ user.log_dir }}/*.log {
+/home/{{ user.name }}/{{ user.log.dir }}/*.log {
     missingok
     noolddir
+    {% if user.log.rotate is defined %}rotate {{ user.log.rotate }}
+    {% endif %}
 }