From 91c691a806fcd46f31b93da93b474c05035eef12 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@debian.org>
Date: Wed, 1 Jul 2015 18:25:11 +0100
Subject: [PATCH] Create dokku's /var/log/dokku/ private namespace

Rename dokku.log to events.log.
Refresh tests accordingly.
---
 dokku                     | 3 ++-
 plugins/20_events/install | 7 ++++++-
 tests/unit/events.bats    | 6 +++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/dokku b/dokku
index b11e051ec..4252f831f 100755
--- a/dokku
+++ b/dokku
@@ -10,7 +10,8 @@ export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
 export DOKKU_NOT_IMPLEMENTED_EXIT=10
 export DOKKU_VALID_EXIT=0
 
-export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="/var/log/dokku.log"}
+export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
+export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
 
 source "$PLUGIN_PATH/common/functions"
 
diff --git a/plugins/20_events/install b/plugins/20_events/install
index 1d352792b..494892bb5 100755
--- a/plugins/20_events/install
+++ b/plugins/20_events/install
@@ -7,6 +7,11 @@ DOKKU_LOGROTATE_FILE=/etc/logrotate.d/dokku
 
 flag_rsyslog_needs_restart=n
 
+# This can be done unconditionally as mkdir -p
+# exits gracefully if the path already exists
+mkdir -m 775 -p "$DOKKU_LOGS_DIR"
+chown syslog:dokku "$DOKKU_LOGS_DIR"
+
 if [[ ! -f  "$DOKKU_EVENTS_LOGFILE" ]]; then
   touch "$DOKKU_EVENTS_LOGFILE"
   # chown syslog:root might not work on SUSE
@@ -23,7 +28,7 @@ fi
 
 if [[ ! -f "$DOKKU_LOGROTATE_FILE" ]]; then
   cat >"$DOKKU_LOGROTATE_FILE" <<EOF
-$DOKKU_EVENTS_LOGFILE {
+$DOKKU_LOGS_DIR/*.log {
         daily
         rotate 7
         missingok
diff --git a/tests/unit/events.bats b/tests/unit/events.bats
index 366cf53d9..e54e38339 100644
--- a/tests/unit/events.bats
+++ b/tests/unit/events.bats
@@ -19,7 +19,11 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
-  run bash -c "stat -c '%U:%G:%a' /var/log/dokku.log"
+  run bash -c "stat -c '%U:%G:%a' /var/log/dokku/"
+  echo "output: "$output
+  echo "status: "$status
+  assert_output "syslog:dokku:775"
+  run bash -c "stat -c '%U:%G:%a' /var/log/dokku/events.log"
   echo "output: "$output
   echo "status: "$status
   assert_output "syslog:dokku:664"