From 6ec275940b02d6bd744aaec9d5329eba53a90b13 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Tue, 26 Jun 2012 15:12:57 -0400
Subject: [PATCH] Use the repo version of the rsyslog config file

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 installer/wheezy/eg_wheezy_installer.sh |  9 ++++---
 installer/wheezy/evergreen-rsyslog.conf | 46 ---------------------------------
 2 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 installer/wheezy/evergreen-rsyslog.conf

diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh
index 96e8f95d1..d0fba7fc8 100755
--- a/installer/wheezy/eg_wheezy_installer.sh
+++ b/installer/wheezy/eg_wheezy_installer.sh
@@ -65,10 +65,6 @@ apt-get -yq install build-essential automake git psmisc ntp rsyslog;
 cp $BASE_DIR/evergreen.ld.conf /etc/ld.so.conf.d/
 ldconfig;
 
-# Configure rsyslog and restart
-cp $BASE_DIR/evergreen-rsyslog.conf /etc/rsyslog.d/evergreen.conf
-/etc/init.d/rsyslog restart
-
 # Create opensrf user and set up environment
 if [ ! "$(grep ^opensrf: /etc/passwd)" ]; then
     useradd -m -s /bin/bash opensrf
@@ -102,6 +98,11 @@ cd /usr/src/evergreen;
 make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-wheezy
 make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install debian-wheezy install_pgsql_server_debs_91
 
+# Configure rsyslog and restart
+cp /home/opensrf/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf /etc/rsyslog.d/evergreen.conf
+/etc/init.d/rsyslog restart
+
+
 # Patch Ejabberd and register users
 if [ ! "$(grep 'public.localhost' /etc/ejabberd/ejabberd.cfg)" ]; then
     cd /etc/ejabberd/
diff --git a/installer/wheezy/evergreen-rsyslog.conf b/installer/wheezy/evergreen-rsyslog.conf
deleted file mode 100644
index f8cdb2191..000000000
--- a/installer/wheezy/evergreen-rsyslog.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-# OpenSRF rsyslog configuration file
-# Bill Erickson <berick@esilibrary.com>
-# 
-# /etc/rsyslog.d/opensrf-rsyslog.conf
-#
-
-$EscapeControlCharactersOnReceive off
-
-# Message format templates
-# TIMESTAMP:::date-pgsql == YYYY-MM-DD HH:MM:SS
-$template msgformat,"%TIMESTAMP:::date-pgsql% %HOSTNAME% %syslogtag%%msg:::drop-last-lf%\n"
-
-# Log file templates -------
-$template osrfsys,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/osrfsys.%$HOUR%.log"
-$template osrferror,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/osrferror.log"
-$template osrfwarn,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/osrfwarn.log"
-$template activity,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/activity.log"
-$template gateway,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/gateway.%$HOUR%.log"
-$template router,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/router.log"
-$template pg,"/var/log/evergreen/%$YEAR%/%$MONTH%/%$DAY%/pg.%$HOUR%.log"
-
-# Selectors ----------------
-# local0 : OpenSRF
-# local1 : OpenSRF "activity"
-# local2 : OpenSRF router
-# local6 : Apache
-
-local0.* ?osrfsys;msgformat
-local1.* ?activity;msgformat
-local2.* ?router:msgformat
-local3.* ?pg:msgformat
-local6.* ?gateway;msgformat
-
-# Warn
-local0.warn ?osrfwarn;msgformat
-local1.warn ?osrfwarn;msgformat
-local2.warn ?osrfwarn;msgformat
-local3.warn ?osrfwarn;msgformat
-local6.warn ?osrfwarn;msgformat
-
-# Error
-local0.error ?osrferror;msgformat
-local1.error ?osrferror;msgformat
-local2.error ?osrferror;msgformat
-local3.error ?osrferror;msgformat
-local6.error ?osrferror;msgformat
-- 
2.11.0