[syslog-ng/f15/master] - disable ssl, sql - honor pidfile to support reload configuration

[Matthias Runge]

commit 49d3f9e91c987f744f2620cb84c911feb9e878d9
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Thu Apr 28 10:13:27 2011 +0200

    - disable ssl, sql
    - honor pidfile to support reload configuration

 syslog-ng.spec      |   11 ++++++++---
 syslog-ng.sysconfig |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index ca1dbca..ad88e9e 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -8,7 +8,7 @@
 
 Name: syslog-ng
 Version: 3.2.3
-Release: 0.%{gitsnapshot}.2%{?dist}
+Release: 0.%{gitsnapshot}.3%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -95,8 +95,8 @@ developing applications that use %{name}.
 	--enable-pcre \
 	--enable-shared \
 	--disable-static \
-	--enable-sql \
-	--enable-ssl \
+	--disable-sql \
+	--disable-ssl \
 	--with-module-dir=/%{_lib}/%{name} \
 	--enable-spoof-source \
 	--enable-dynamic-linking
@@ -231,6 +231,11 @@ fi
 
 
 %changelog
+* Thu Apr 28 2011 Matthias Runge <mrunge at matthias-runge.de> - 3.2.3-0.20110424.3
+- honor pidfile
+- disable ssl
+- disable sql
+
 * Tue Apr 26 2011 Matthias Runge <mrunge at matthias-runge.de> - 3.2.3-0.20110424.2
 - drop support for fedora without systemd
 
diff --git a/syslog-ng.sysconfig b/syslog-ng.sysconfig
index 97b9469..c8083f7 100644
--- a/syslog-ng.sysconfig
+++ b/syslog-ng.sysconfig
@@ -1,3 +1,3 @@
 SYSLOGNG_PID="/var/run/syslog-ng.pid"
-SYSLOGNG_OPTIONS="-F"
+SYSLOGNG_OPTIONS="-F -p /var/run/syslogd.pid"
 SYSLOGNG_COMPAT_PID="/var/run/syslogd.pid"