mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
usermngr: Remove deprecated RemoteAccessCapable
This commit is contained in:
parent
d49e72be07
commit
f6510849d6
3 changed files with 15 additions and 19 deletions
|
|
@ -5,13 +5,13 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=usermngr
|
PKG_NAME:=usermngr
|
||||||
PKG_VERSION:=1.3.7
|
PKG_VERSION:=1.3.8
|
||||||
|
|
||||||
LOCAL_DEV:=0
|
LOCAL_DEV:=0
|
||||||
ifneq ($(LOCAL_DEV),1)
|
ifneq ($(LOCAL_DEV),1)
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
|
PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
|
||||||
PKG_SOURCE_VERSION:=b6f34ac20c3a7ebdb500a6a9cb44a6d139925734
|
PKG_SOURCE_VERSION:=fa6a85c147ba0f45d697b2e6bde9039c3b0d4c98
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||||
PKG_MIRROR_HASH:=skip
|
PKG_MIRROR_HASH:=skip
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,4 @@
|
||||||
config user 'admin'
|
config users 'users'
|
||||||
option enabled '1'
|
|
||||||
option remote_access '1'
|
|
||||||
|
|
||||||
config user 'user'
|
|
||||||
option enabled '1'
|
|
||||||
option remote_access '1'
|
|
||||||
|
|
||||||
config role 'full_access'
|
|
||||||
option enabled '1'
|
option enabled '1'
|
||||||
option role_id '1'
|
option loglevel '3'
|
||||||
option name 'full_access'
|
|
||||||
|
|
||||||
config role 'untrusted'
|
|
||||||
option enabled '1'
|
|
||||||
option role_id '2'
|
|
||||||
option name 'Untrusted'
|
|
||||||
|
|
|
||||||
|
|
@ -7,14 +7,23 @@ USE_PROCD=1
|
||||||
PROG=/usr/sbin/usermngr
|
PROG=/usr/sbin/usermngr
|
||||||
|
|
||||||
start_service() {
|
start_service() {
|
||||||
procd_open_instance usermngr_dm
|
local loglevel
|
||||||
|
|
||||||
|
loglevel="$(uci -q get users.users.loglevel)"
|
||||||
|
|
||||||
|
procd_open_instance usermngr
|
||||||
procd_set_param command $PROG
|
procd_set_param command $PROG
|
||||||
|
|
||||||
|
if [ -n "${loglevel}" ]; then
|
||||||
|
procd_append_param command -l "${loglevel}"
|
||||||
|
fi
|
||||||
|
|
||||||
procd_set_param respawn
|
procd_set_param respawn
|
||||||
procd_close_instance
|
procd_close_instance
|
||||||
}
|
}
|
||||||
|
|
||||||
reload_service() {
|
reload_service() {
|
||||||
ret=$(ubus call service list '{"name":"users"}' | jsonfilter -qe '@.users.instances.usermngr_dm.running')
|
ret=$(ubus call service list '{"name":"users"}' | jsonfilter -qe '@.users.instances.usermngr.running')
|
||||||
if [ "$ret" != "true" ]; then
|
if [ "$ret" != "true" ]; then
|
||||||
stop
|
stop
|
||||||
start
|
start
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue