Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (295d78eef3f3bb11520ec2872b1652248e456134)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jeremy Blosser <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (295d78eef3f3bb11520ec2872b1652248e456134)
  • Date: Wed, 20 Oct 2010 18:59:28 -0500

GIT changes to master grimoire by Jeremy Blosser <jblosser-smgl AT firinn.org>:

utils/rsyslog/CONFIGURE | 3 ++-
utils/rsyslog/FINAL | 5 +++++
utils/rsyslog/HISTORY | 5 +++++
utils/rsyslog/INSTALL | 5 ++++-
utils/rsyslog/init.d/rsyslog | 6 ++----
utils/rsyslog/init.d/rsyslog.conf | 6 +++---
6 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit 295d78eef3f3bb11520ec2872b1652248e456134
Author: Jeremy Blosser <jblosser-smgl AT firinn.org>
Commit: Jeremy Blosser <jblosser-smgl AT firinn.org>

rsyslog: Match upstream install; ask before installing a default config,
and don't add runtime args by default.

diff --git a/utils/rsyslog/CONFIGURE b/utils/rsyslog/CONFIGURE
index 11604b8..80b0129 100755
--- a/utils/rsyslog/CONFIGURE
+++ b/utils/rsyslog/CONFIGURE
@@ -13,4 +13,5 @@ config_query_option RSYSLOG_OPTS 'Enable diagnostic tools?'
n \
'--disable-diagtools' &&
config_query_option RSYSLOG_TOPS 'Compile text input module (provides the
ability to convert any standard text file into a syslog message)?' n \
'--enable-imfile' \
- '--disable-imfile'
+ '--disable-imfile' &&
+config_query RSYSLOG_CONF "Install a default rsyslog.conf?" n
diff --git a/utils/rsyslog/FINAL b/utils/rsyslog/FINAL
new file mode 100755
index 0000000..5859df2
--- /dev/null
+++ b/utils/rsyslog/FINAL
@@ -0,0 +1,5 @@
+# if they're letting us install a config file, also make sure the sysconfig
+# file enables the right compatability level
+if [ "${RSYSLOG_CONF}" == "y" ]; then
+ sedit "s/^#COMPAT/COMPAT/" ${INSTALL_ROOT}/etc/sysconfig/rsyslog
+fi
diff --git a/utils/rsyslog/HISTORY b/utils/rsyslog/HISTORY
index 90a9b5b..8344732 100644
--- a/utils/rsyslog/HISTORY
+++ b/utils/rsyslog/HISTORY
@@ -1,3 +1,8 @@
+2010-10-20 Jeremy Blosser <jblosser-smgl AT firinn.org>
+ * CONFIGURE, INSTALL, FINAL, init.d/rsyslog{,.conf}: Match upstream
+ install; ask before installing a default config, and don't add
+ runtime args by default.
+
2010-08-25 Peng Chang (Charles) <chp AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated RSYSLOG_BRANCH=v4stable to 4.6.4
diff --git a/utils/rsyslog/INSTALL b/utils/rsyslog/INSTALL
index d7d111d..5f75bd4 100755
--- a/utils/rsyslog/INSTALL
+++ b/utils/rsyslog/INSTALL
@@ -1,2 +1,5 @@
default_install &&
-install_config_file ${SPELL_DIRECTORY}/rsyslog.conf /etc/rsyslog.conf
+
+if [ "${RSYSLOG_CONF}" == "y" ]; then
+ install_config_file ${SPELL_DIRECTORY}/rsyslog.conf /etc/rsyslog.conf
+fi
diff --git a/utils/rsyslog/init.d/rsyslog b/utils/rsyslog/init.d/rsyslog
index 2900757..115ab0e 100644
--- a/utils/rsyslog/init.d/rsyslog
+++ b/utils/rsyslog/init.d/rsyslog
@@ -4,13 +4,11 @@

PIDFILE=/var/run/rsyslogd.pid
PROGRAM=/usr/sbin/rsyslogd
-ARGS="-c${COMPAT}"
+[ -n "${COMPAT}" ] && ARGS="-c${COMPAT}"
RUNLEVEL=S
NEEDS="+local_fs"
PROVIDES=syslog

-if ! [[ -z ${RSYSLOG_CONFIG} ]]; then
- ARGS="${ARGS} -f ${RSYSLOG_CONFIG}"
-fi
+[ -n "${RSYSLOG_CONFIG}" ] && ARGS="${ARGS} -f ${RSYSLOG_CONFIG}"

. /etc/init.d/smgl_init
diff --git a/utils/rsyslog/init.d/rsyslog.conf
b/utils/rsyslog/init.d/rsyslog.conf
index b6e37de..8f0fd78 100644
--- a/utils/rsyslog/init.d/rsyslog.conf
+++ b/utils/rsyslog/init.d/rsyslog.conf
@@ -1,6 +1,6 @@
# Configuration compatibility
-VERSION=$(/usr/sbin/rsyslogd -v | head -n1 | gawk '{print $2}' | sed -e
's/,//')
-COMPAT=${VERSION:0:1}
+#COMPAT_VERSION=$(/usr/sbin/rsyslogd -v | head -n1 | gawk '{print $2}' | sed
-e 's/,//')
+#COMPAT=${COMPAT_VERSION:0:1}

# Full path to configuration file (and its filename)
-RSYSLOG_CONFIG="/etc/rsyslog.conf"
+#RSYSLOG_CONFIG="/etc/rsyslog.conf"



  • [SM-Commit] GIT changes to master grimoire by Jeremy Blosser (295d78eef3f3bb11520ec2872b1652248e456134), Jeremy Blosser, 10/20/2010

Archive powered by MHonArc 2.6.24.

Top of Page