bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packages/pure-ftpd: use new service functions

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29054 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-13 22:15:35 +00:00
parent 1a2baa47d5
commit f6164664c6
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/pure-ftpd/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pure-ftpd PKG_NAME:=pure-ftpd
PKG_VERSION:=1.0.32 PKG_VERSION:=1.0.32
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://download.pureftpd.org/pub/pure-ftpd/releases PKG_SOURCE_URL:=http://download.pureftpd.org/pub/pure-ftpd/releases

32
net/pure-ftpd/files/pure-ftpd.init
View File

@ -1,10 +1,14 @@
#!/bin/sh /etc/rc.common #!/bin/sh /etc/rc.common
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2011 OpenWrt.org
START=50 START=50
SSD=start-stop-daemon # TODO: allow multiple instance to run with different pid-files
PIDF=/var/run/pure-ftpd.pid
PROG=/usr/sbin/pure-ftpd # XXX: pure-ftpd changes it's name to 'pure-ftpd (SERVER) ...'
SERVICE_MATCH_EXEC=
SERVICE_MATCH_NAME=1
SERVICE_USE_PID=1
append_bool() { append_bool() {
local section="$1" local section="$1"
@ -24,10 +28,13 @@ append_string() {
[ -n "$_val" ] && append args "$3 $_val" [ -n "$_val" ] && append args "$3 $_val"
} }
start_service() { start_instance() {
local section="$1" local section="$1"
args=""
config_get_bool enabled "$section" 'enabled' '1'
[ $enabled -gt 0 ] || return 1
args=""
append_string "$section" trustedgid "-a" append_string "$section" trustedgid "-a"
append_string "$section" syslogfacility "-f" append_string "$section" syslogfacility "-f"
append_string "$section" fortunesfile "-F" append_string "$section" fortunesfile "-F"
@ -87,23 +94,14 @@ start_service() {
append_string "$section" port "-S" append_string "$section" port "-S"
append_string "$section" authentication "-l" append_string "$section" authentication "-l"
config_get_bool "enabled" "$section" "enabled" '1' service_start /usr/sbin/pure-ftpd -B $args
[ "$enabled" -gt 0 ] && $SSD -S -p $PIDF -q -x $PROG -- -g $PIDF -B $args
}
stop_service() {
killall pure-ftpd 2>&1 > /dev/null
# FIXME: Fix Busybox start-stop-daemon to work with multiple PIDs
# $SSD -K -p $PIDF -q
} }
start() { start() {
config_load "pure-ftpd" config_load "pure-ftpd"
config_foreach start_service "pure-ftpd" config_foreach start_instance "pure-ftpd"
} }
stop() { stop() {
config_load "pure-ftpd" service_stop /usr/sbin/pure-ftpd
config_foreach stop_service "pure-ftpd"
} }