From 60cdc999e716c503a923d6ca31676a150180c8f9 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 16 May 2013 14:13:32 -0400
Subject: [PATCH] Updating squeeze auto-installer

Use the stock EG rsyslog config
minor CPAN prereq-follow config repairs
autoreconf -i instead of autogen.sh

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 installer/squeeze/eg_squeeze_installer.sh | 16 +++++------
 installer/squeeze/evergreen-rsyslog.conf  | 46 -------------------------------
 2 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 installer/squeeze/evergreen-rsyslog.conf

diff --git a/installer/squeeze/eg_squeeze_installer.sh b/installer/squeeze/eg_squeeze_installer.sh
index b659786de..5c1b325e3 100755
--- a/installer/squeeze/eg_squeeze_installer.sh
+++ b/installer/squeeze/eg_squeeze_installer.sh
@@ -34,14 +34,12 @@ if [ ! "$(grep 'squeeze-backports' /etc/apt/sources.list)" ]; then
     exit;
 fi;
 
-
 # -----------------------------------------------------------------------
 # force CPAN to load by installing something that should already be installed
 cpan Fcntl
 
 # CPAN follow pre-reqs?
-cpan_policy=$(perl -MCPAN::Config -e 'print $CPAN::Config->{prerequisites_policy}');
-if [ $cpan_policy != 'follow' ]; then
+if [ ! "$(echo 'o conf prerequisites_policy' | cpan | grep follow)" ]; then
     echo '
 
 -----------------------------------------------------------------------
@@ -75,10 +73,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
@@ -99,6 +93,10 @@ cd /usr/src/evergreen;
 make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-squeeze
 make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install debian-squeeze install_pgsql_server_backport_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
@@ -121,7 +119,7 @@ fi;
 # Build and install OpenSRF
 OSRF_COMMAND='
 cd /home/opensrf/OpenSRF;
-./autogen.sh;
+autoreconf -i;
 ./configure --prefix=/openils --sysconfdir=/openils/conf;
 make;'
 
@@ -132,7 +130,7 @@ make install
 # Build and install the ILS
 OSRF_COMMAND='
 cd /home/opensrf/Evergreen;
-./autogen.sh;
+autoreconf -i;
 ./configure --prefix=/openils --sysconfdir=/openils/conf;
 make;'
 
diff --git a/installer/squeeze/evergreen-rsyslog.conf b/installer/squeeze/evergreen-rsyslog.conf
deleted file mode 100644
index f8cdb2191..000000000
--- a/installer/squeeze/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