From fd7a691e9fe3377069390bdd8fc364644ad79b4d Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <michal@hrusecky.net>
Date: Thu, 30 Jul 2020 09:56:20 +0200
Subject: [PATCH] lists/contracts/shield: Extend shield support

---
 lists/contracts/shield.lua.m4 | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/lists/contracts/shield.lua.m4 b/lists/contracts/shield.lua.m4
index 551b48b4..39d18028 100644
--- a/lists/contracts/shield.lua.m4
+++ b/lists/contracts/shield.lua.m4
@@ -1,8 +1,15 @@
 include(utils.m4)dnl
 _FEATURE_GUARD_
 
--- No more Foris and LuCI
+-- No more Foris and LuCI and data collect UI
 Uninstall("foris", "luci", "luci-base", { priority = 45 })
+Uninstall("reforis-data-collection-plugin", { priority = 45 })
+
+-- Alternative versions of packages
+Install("shield-support", "reforis-shield", { priority = 45 })
+
+-- Extra usability packages
+Install("ip_autoselector", "firewall-redirect-192_168_1_1", { priority = 45 })
 
 -- Extra security
 Install('common_passwords', { priority = 45 })
@@ -16,5 +23,10 @@ options = {
 }
 Export("options")
 Script("../pkglists/datacollection.lua")
+Unexport("options")
+
+-- Extra software
+Script("../pkglists/netmetr.lua")
+Script("../pkglists/openvpn.lua")
 
 _END_FEATURE_GUARD_
-- 
GitLab