diff options
| author |   Michael Weber <xmw@gentoo.org> | 2011-06-17 00:35:32 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2011-06-17 00:35:32 +0000 |
| commit | 5beebe12660570779f8b919da943f88c02d33aaf (patch) | |
| tree | 08506d26a13e878788211c2bf444eb96be3605f9 /net-ftp/oftpd/files | |
| parent | Stable for HPPA (bug #370997). (diff) | |
| download | historical-5beebe12660570779f8b919da943f88c02d33aaf.tar.gz historical-5beebe12660570779f8b919da943f88c02d33aaf.tar.bz2 historical-5beebe12660570779f8b919da943f88c02d33aaf.zip | |
Revision bump, improvements in the conf.d file
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'net-ftp/oftpd/files')
| -rw-r--r-- | net-ftp/oftpd/files/conf.d.oftpd-r7 (renamed from net-ftp/oftpd/files/conf.d.oftpd-r6) | 7 | ||||
| -rw-r--r-- | net-ftp/oftpd/files/init.d.oftpd-r7 (renamed from net-ftp/oftpd/files/init.d.oftpd-r1) | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r6 b/net-ftp/oftpd/files/conf.d.oftpd-r7 index dee1cba00863..81cd2a5903ed 100644 --- a/net-ftp/oftpd/files/conf.d.oftpd-r6 +++ b/net-ftp/oftpd/files/conf.d.oftpd-r7 @@ -13,5 +13,8 @@ FTPUSER=ftp FTPROOT=/home/ftp # FTPPORT (TCP port) -# 22 is the standard ftp port, but you can change it here to something else -FTPPORT=22 +# 21 is the standard ftp port, but you can change it here to something else +FTPPORT=21 + +## Uncoment this line to activate oftpd service +OFTPD_OPTS="-p ${FTPPORT} ${FTPUSER} ${FTPPORT}" diff --git a/net-ftp/oftpd/files/init.d.oftpd-r1 b/net-ftp/oftpd/files/init.d.oftpd-r7 index a910b92fa188..da73e608e662 100644 --- a/net-ftp/oftpd/files/init.d.oftpd-r1 +++ b/net-ftp/oftpd/files/init.d.oftpd-r7 @@ -1,15 +1,15 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r1,v 1.3 2009/06/13 19:31:06 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r7,v 1.1 2011/06/17 00:35:32 xmw Exp $ depend() { need net } checkconfig() { - if [ -z "${FTPUSER}" ] || [ -z "${FTPROOT}" ] || [ -z "${FTPPORT}" ] ; then - eerror "You need to setup FTPUSER, FTPROOT and FTPPORT in /etc/conf.d/oftpd" + if [ -z "${OFTPD_OPTS}" ] ; then + eerror "You need to setup OFTPD_OPTS /etc/conf.d/oftpd" return 1 fi } @@ -18,7 +18,7 @@ start() { checkconfig || return 1 ebegin "Starting oftpd" - start-stop-daemon --start --exec /usr/sbin/oftpd -- -p ${FTPPORT} ${FTPUSER} ${FTPROOT} + start-stop-daemon --start --exec /usr/sbin/oftpd -- ${OFTPD_OPTS} eend $? } |