Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pptpd: Update init script

Browse source 
This replaces the use of uci_validate_section() with
uci_load_validate(), which removes the need to declare local variables
for every config option.

This also adds a service_triggers() function and removes some
unnecessary curly brackets.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
Jeffery To 2019-02-03 19:10:10 +08:00
parent fdc5c5be60
commit f9386270db
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/pptpd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=pptpd PKG_NAME:=pptpd
PKG_VERSION:=1.4.0 PKG_VERSION:=1.4.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/poptop PKG_SOURCE_URL:=@SF/poptop

29
net/pptpd/files/pptpd.init
View file

@ -10,13 +10,13 @@ CHAP_SECRETS=/var/etc/chap-secrets
OPTIONS_PPTP=/var/etc/options.pptpd OPTIONS_PPTP=/var/etc/options.pptpd
validate_login_section() { validate_login_section() {
uci_validate_section pptpd login "${1}" \ uci_load_validate pptpd login "$1" "$2" \
'username:string' \ 'username:string' \
'password:string' 'password:string'
} }
validate_pptpd_section() { validate_pptpd_section() {
uci_validate_section pptpd service "${1}" \ uci_load_validate pptpd service "$1" "$2" \
'enabled:uinteger' \ 'enabled:uinteger' \
'localip:string' \ 'localip:string' \
'remoteip:string' \ 'remoteip:string' \
@ -25,21 +25,19 @@ validate_pptpd_section() {
} }
setup_login() { setup_login() {
validate_login_section "${1}" || { [ "$2" = 0 ] || {
echo "validation failed" echo "validation failed"
return 1 return 1
} }
[ -n "${username}" ] || return 0 [ -n "$username" ] || return 0
[ -n "${password}" ] || return 0 [ -n "$password" ] || return 0
echo "${username} pptp-server ${password} *" >> $CHAP_SECRETS echo "$username pptp-server $password *" >> $CHAP_SECRETS
} }
setup_config() { setup_config() {
local enabled localip remoteip mppe [ "$2" = 0 ] || {
validate_pptpd_section "${1}" || {
echo "validation failed" echo "validation failed"
return 1 return 1
} }
@ -61,8 +59,8 @@ setup_config() {
start_service() { start_service() {
config_load pptpd config_load pptpd
setup_config pptpd || return validate_pptpd_section pptpd setup_config || return
config_foreach setup_login login config_foreach validate_login_section login setup_login
ln -sfn $CHAP_SECRETS /etc/ppp/chap-secrets ln -sfn $CHAP_SECRETS /etc/ppp/chap-secrets
@ -70,3 +68,12 @@ start_service() {
procd_set_param command $BIN -c $CONFIG --fg -o $OPTIONS_PPTP procd_set_param command $BIN -c $CONFIG --fg -o $OPTIONS_PPTP
procd_close_instance procd_close_instance
} }
service_triggers () {
procd_add_reload_trigger "pptpd"
procd_open_validate
validate_pptpd_section
validate_login_section
procd_close_validate
}