rpms/3proxy/F-12 3proxy.init,1.1,1.2 3proxy.spec,1.2,1.3
Pavel Alexeev
hubbitus at fedoraproject.org
Sat Nov 28 22:29:59 UTC 2009
Author: hubbitus
Update of /cvs/pkgs/rpms/3proxy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20775
Modified Files:
3proxy.init 3proxy.spec
Log Message:
Again new init-script for Fix BZ#533144 :).
Index: 3proxy.init
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/F-12/3proxy.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 3proxy.init 27 Aug 2009 20:14:26 -0000 1.1
+++ 3proxy.init 28 Nov 2009 22:29:58 -0000 1.2
@@ -11,7 +11,6 @@
#
# processname: 3proxy
# config: /etc/3proxy.cfg
-# pidfile: /var/run/3proxy.pid
WITHOUT_RC_COMPAT=1
@@ -22,26 +21,25 @@ prog=3proxy
CONFIG=/etc/3proxy.cfg
PROXY=/usr/bin/3proxy
RETVAL=0
-PIDFILE=/var/run/3proxy.pid
LOCKFILE=/var/lock/subsys/3proxy
#LOGFILE=/var/log/3proxy.log
start() {
echo -n $"Starting $prog: "
# daemon --pidfile "${PIDFILE}" sh -c "exec \"$PROXY\" \"$CONFIG\" 2>&1 > \"$LOGFILE\" &"
- daemon --pidfile "${PIDFILE}" "$PROXY" "$CONFIG"
+ daemon "$PROXY" "$CONFIG"
RETVAL=$?
echo
- [ $RETVAL = 0 ] && touch ${LOCKFILE}
+ [ 0 -eq $RETVAL ] && touch ${LOCKFILE}
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
- killproc -p "${PIDFILE}" -d 1 "$PROXY"
+ killproc -d 3 "$prog"
RETVAL=$?
echo
- [ $RETVAL = 0 ] && rm -f ${LOCKFILE} ${PIDFILE}
+ [ 0 -eq $RETVAL ] && rm -f ${LOCKFILE}
return $RETVAL
}
@@ -52,7 +50,7 @@ restart() {
reload(){
echo -n $"Reloading $prog: "
- killproc -p ${pidfile} $httpd -USR1
+ killproc $prog -USR1
RETVAL=$?
echo
}
@@ -75,11 +73,11 @@ case "$1" in
RETVAL=$?
;;
status)
- status -p "$PIDFILE" "$PROXY"
+ status "$PROXY"
RETVAL=$?
;;
*)
- echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ echo $"Usage: $0 {start|stop|restart|condrestart|status|reload}"
RETVAL=1
;;
esac
Index: 3proxy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/3proxy/F-12/3proxy.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 3proxy.spec 9 Nov 2009 12:48:51 -0000 1.2
+++ 3proxy.spec 28 Nov 2009 22:29:58 -0000 1.3
@@ -1,6 +1,6 @@
Name: 3proxy
Version: 0.6
-Release: 5%{?dist}
+Release: 7%{?dist}
Summary: Tiny but very powerful proxy
Summary(ru): Маленький, но крайне мощный прокси-сервер
@@ -101,6 +101,12 @@ fi
%{_mandir}/man8/*.8.gz
%changelog
+* Wed Nov 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-7
+- Again new init-script for Fix BZ#533144 :).
+
+* Wed Nov 25 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-6
+- Forgot commit new init-script for Fix BZ#533144.
+
* Sun Nov 8 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.6-5
- Fix BZ#533144:
- Add reload section to service file, fix stop.
More information about the fedora-extras-commits
mailing list