[gentoo-commits] gentoo-x86 commit in net-ftp/proftpd/files: proftpd.rc6 proftpd-1.3.1_rc3-mod_mysql.patch

[Luca Longinotti (chtekk)]

chtekk      08/04/17 07:57:58

  Modified:             proftpd.rc6
  Removed:              proftpd-1.3.1_rc3-mod_mysql.patch
  Log:
  Version bump to ProFTPd 1.3.1.
  (Portage version: 2.1.5_rc4)

Revision  Changes    Path
1.12                 net-ftp/proftpd/files/proftpd.rc6

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6?r1=1.11&r2=1.12

Index: proftpd.rc6
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- proftpd.rc6	23 Sep 2006 19:07:05 -0000	1.11
+++ proftpd.rc6	17 Apr 2008 07:57:57 -0000	1.12
@@ -1,7 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.11 2006/09/23 19:07:05 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.12 2008/04/17 07:57:57 chtekk Exp $
+
+opts="${opts} reload"
 
 depend() {
 	need net
@@ -14,6 +16,9 @@
 		eerror "There is a sample file in /etc/proftpd."
 		return 1
 	fi
+	ebegin "Checking proftpd configuration"
+	/usr/sbin/proftpd -t -c /etc/proftpd/proftpd.conf &>/dev/null
+	eend $? "Configuration error: please fix your configuration file (/etc/proftpd/proftpd.conf)."
 }
 
 start() {
@@ -28,3 +33,14 @@
 	start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/proftpd.pid
 	eend $?
 }
+
+reload() {
+	if [ ! -f /var/run/proftpd.pid ] ; then
+		eerror "proftpd isn't running!"
+		return 1
+	fi
+	checkconfig || return 1
+	ebegin "Reloading proftpd"
+	kill -HUP `cat /var/run/proftpd.pid` &>/dev/null
+	eend $?
+}



-- 
gentoo-commits@l.g.o mailing list