From 29fd47547c6aff5a419ecb1dda36e105e21d1aa4 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Sun, 18 Jan 2015 16:53:43 -0500 Subject: [PATCH] make log directory a variable --- roles/syslog-aggregator/tasks/main.yml | 2 +- roles/syslog-aggregator/templates/syslog-ng-buildbot.conf.j2 | 2 +- roles/syslog-aggregator/vars/main.yml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 roles/syslog-aggregator/vars/main.yml diff --git a/roles/syslog-aggregator/tasks/main.yml b/roles/syslog-aggregator/tasks/main.yml index 33f9da3..4058ae7 100644 --- a/roles/syslog-aggregator/tasks/main.yml +++ b/roles/syslog-aggregator/tasks/main.yml @@ -24,7 +24,7 @@ cron: name: log-cleanup user: root - job: "find /data/log -mtime +28 -type f -exec ls {} \\;" + job: "find {{ log_root }} -mtime +28 -type f -exec ls {} \\;" minute: 0 hour: 0 state: present diff --git a/roles/syslog-aggregator/templates/syslog-ng-buildbot.conf.j2 b/roles/syslog-aggregator/templates/syslog-ng-buildbot.conf.j2 index a5668d6..2c74904 100644 --- a/roles/syslog-aggregator/templates/syslog-ng-buildbot.conf.j2 +++ b/roles/syslog-aggregator/templates/syslog-ng-buildbot.conf.j2 @@ -10,7 +10,7 @@ source src_net { }; destination per_host { - file("/data/log/$HOST/$YEAR-$MONTH-$DAY.log" + file("{{ log_root }}/$HOST/$YEAR-$MONTH-$DAY.log" owner(root) group(root) perm(0644) diff --git a/roles/syslog-aggregator/vars/main.yml b/roles/syslog-aggregator/vars/main.yml new file mode 100644 index 0000000..686defb --- /dev/null +++ b/roles/syslog-aggregator/vars/main.yml @@ -0,0 +1,2 @@ +--- +log_root: /data/log