From 6ae1af9694b1361acb912cce170e769294fcc11c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 25 Feb 2018 07:00:42 +0100
Subject: [PATCH] gluon-mesh-vpn-core: use OpenWrt's user/group management
---
package/gluon-mesh-vpn-core/Makefile | 1 +
.../gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile
index 057d3bfac..b822ac05c 100644
--- a/package/gluon-mesh-vpn-core/Makefile
+++ b/package/gluon-mesh-vpn-core/Makefile
@@ -12,6 +12,7 @@ define Package/gluon-mesh-vpn-core
CATEGORY:=Gluon
TITLE:=Basic support for connecting meshes via VPN tunnels
DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables +iptables-mod-extra +simple-tc
+ USERID:=:gluon-mesh-vpn=800
endef
define Build/Prepare
diff --git a/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn
index ad89db8d1..d02bb7f6e 100755
--- a/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn
+++ b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn
@@ -39,8 +39,6 @@ end
users.remove_user('gluon-fastd')
users.remove_group('gluon-fastd')
-users.add_group('gluon-mesh-vpn', 800)
-
uci:section('firewall', 'include', 'mesh_vpn_dns', {
type = 'restore',
path = '/lib/gluon/mesh-vpn/iptables.rules',
--
GitLab