Added dependency for initscripts and sysvinit

* Moved to new CONFIG directory
  * Updated init script to exit non zero if status shows nothing running

CONFIG/etc/logrotate.d/rsyslog

@@ -7,7 +7,7 @@
 	delaycompress
 	compress
 	postrotate
-		invoke-rc.d rsyslog rotate > /dev/null
+		/etc/init.d/rsyslog reload > /dev/null
 	endscript
 }
 
@@ -32,6 +32,6 @@
 	delaycompress
 	sharedscripts
 	postrotate
-		invoke-rc.d rsyslog rotate > /dev/null
+		/etc/init.d/rsyslog reload > /dev/null
 	endscript
 }

Makefile

@@ -62,14 +62,14 @@
 #		of the package.
 
 ARCH = x86_64
-DEPENDS = e2fsprogs,glibc,gmp,krb5,libgnutls,libnettle,logrotate,zlib
+DEPENDS = e2fsprogs,glibc,gmp,initscripts,krb5,libgnutls,libnettle,logrotate,sysvinit,zlib
 BUILDDEPS = 
 SRCPKG = 
 URL = https://www.rsyslog.com/
 REPO = main
 BRIEF = RSYSLOG is the rocket-fast system for log processing
 DESC = RSYSLOG is the rocket-fast system for log processing
-SNAPVER = 1
+SNAPVER = 4
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -129,12 +129,7 @@ $(ROOT): $(SRCDIR)/tools/rsyslogd
 	@cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \
 	install -v -d -m 0755 $(ROOT)/etc/init.d && \
 	install -v -d -m 0755 $(ROOT)/etc/rsyslog.d && \
-	install -v -d -m 0755 $(ROOT)/usr/share/$(PACKAGE) && \
 	install -v -d -m 0755 $(ROOT)/var/spool/rsyslog && \
-	install -v -m 0644 $(SNAPDIR)/rsyslog.conf \
-		$(ROOT)/usr/share/$(PACKAGE)/rsyslog.conf && \
-	install -v -m 0644 $(SNAPDIR)/rsyslog.logrotate \
-		$(ROOT)/usr/share/$(PACKAGE)/rsyslog.logrotate && \
 	install -v -m 0755 $(SNAPDIR)/rsyslog.init \
 		$(ROOT)/etc/init.d/rsyslog
 
@@ -147,5 +142,6 @@ clean:
 		$(SNAPINFO) \
 		$(MANIFEST) \
 		$(FILES) \
+		$(CONFIG) \
 		$(SRCDIR)
 

SNAP/rsyslog.init

@@ -37,9 +37,8 @@ case "$1" in
     sleep 1
     $0 start
     ;;
-
   status)
-    status_of_proc -p "$PIDFILE" "$DAEMON"
+    status_of_proc -p "$PIDFILE" "$DAEMON" || exit 1
     ;;
   *)
     echo "Usage: $0 [start|stop|reload|restart|status]"

SNAP/usher

@@ -7,14 +7,6 @@ case $1 in
     exit 0
     ;;
   postinst)
-    if [ ! -f /etc/rsyslog.conf ]; then
-      cp /usr/share/rsyslog/rsyslog.conf /etc/rsyslog.conf
-    fi
-
-    if [ ! -f /etc/logrotate.d/rsyslog ]; then
-      cp /usr/share/rsyslog/rsyslog.logrotate /etc/logrotate.d/rsyslog
-    fi
-
     /etc/init.d/rsyslog status 2>&1 > /dev/null && /etc/init.d/rsyslog restart
 
     exit 0