From 3fc5d448cdc043c815b177ade72305d970c9f84c Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Wed, 15 Jun 2011 16:59:39 -0700
Subject: Bugfix 6767: Move log files from /tmp to /var/log/vyatta.
---
scripts/vyatta-boot-config-loader | 4 ++--
scripts/vyatta-cfg-cmd-wrapper | 8 +++++---
scripts/vyatta-config-loader.pl | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
(limited to 'scripts')
diff --git a/scripts/vyatta-boot-config-loader b/scripts/vyatta-boot-config-loader
index 3872974..d7359fb 100755
--- a/scripts/vyatta-boot-config-loader
+++ b/scripts/vyatta-boot-config-loader
@@ -4,9 +4,9 @@ BOOT_FILE=$1
shift
CAPI=/bin/cli-shell-api
-CLOG=/tmp/vyatta-config-loader.log
+CLOG=/var/log/vyatta/vyatta-config-loader.log
COMMIT=/opt/vyatta/sbin/my_commit
-COMMIT_LOG=/tmp/vyatta-commit.log
+COMMIT_LOG=/var/log/vyatta/vyatta-commit.log
do_log () {
local level=$1
diff --git a/scripts/vyatta-cfg-cmd-wrapper b/scripts/vyatta-cfg-cmd-wrapper
index b0ec349..952112f 100755
--- a/scripts/vyatta-cfg-cmd-wrapper
+++ b/scripts/vyatta-cfg-cmd-wrapper
@@ -26,6 +26,8 @@
export vyatta_sysconfdir=/opt/vyatta/etc
export vyatta_sbindir=/opt/vyatta/sbin
+LOGFILE=/var/log/vyatta/vyatta-commit.log
+
# allow env variable to override default session id (ppid). this enables
# the script to handle cases where the invocations can come from
# different parents.
@@ -68,9 +70,9 @@ case "$1" in
;;
commit)
export COMMIT_VIA=cfg-cmd-wrapper
- ${vyatta_sbindir}/my_commit -a >> /tmp/vyatta-commit.log
- ${vyatta_sbindir}/my_commit -s >> /tmp/vyatta-commit.log
- exec ${vyatta_sbindir}/my_commit -e -d >> /tmp/vyatta-commit.log
+ ${vyatta_sbindir}/my_commit -a >> $LOGFILE
+ ${vyatta_sbindir}/my_commit -s >> $LOGFILE
+ exec ${vyatta_sbindir}/my_commit -e -d >> $LOGFILE
;;
commit_with_error)
exec ${vyatta_sbindir}/my_commit
diff --git a/scripts/vyatta-config-loader.pl b/scripts/vyatta-config-loader.pl
index 168a8ea..c5a1164 100755
--- a/scripts/vyatta-config-loader.pl
+++ b/scripts/vyatta-config-loader.pl
@@ -29,7 +29,7 @@ use Sys::Syslog qw(:standard :macros);
use POSIX qw(strftime);
my $CWRAPPER = '/opt/vyatta/sbin/vyatta-cfg-cmd-wrapper';
-my $CONFIG_LOG = '/tmp/vyatta-config-loader.log';
+my $CONFIG_LOG = '/var/log/vyatta/vyatta-config-loader.log';
my $COMMIT_CMD = "$CWRAPPER commit";
my $CLEANUP_CMD = "$CWRAPPER cleanup";
my $BEGIN_CMD = "$CWRAPPER begin";
--
cgit v1.2.3