From 99cc9538b1b931a12b34b4762c12abc79f10273d Mon Sep 17 00:00:00 2001
From: Grische <2787581+grische@users.noreply.github.com>
Date: Sun, 8 Dec 2024 10:46:06 +0100
Subject: [PATCH] use new Parker sources and rename VPN package

---
 Makefile                | 2 +-
 image-customization.lua | 4 +---
 modules                 | 8 ++++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 3123dca6..f6aaf825 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/ffbs/gluon-parker.git
-GLUON_GIT_REF := 75c73a573839e1c8608653be23f780dbba06f63e # latest v2023.2.x-parker
+GLUON_GIT_REF := 674bb98428c3b4c95761502144d893ca5879cc05 # latest v2023.2.x-parker
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
diff --git a/image-customization.lua b/image-customization.lua
index aa4abd33..5b20b515 100644
--- a/image-customization.lua
+++ b/image-customization.lua
@@ -6,7 +6,6 @@ features{
     'config-mode-geo-location-osm',
     'config-mode-mesh-vpn',
     'mesh-batman-adv-15',
-    'mesh-vpn-parker',
     'respondd',
     'status-page',
     'web-advanced',
@@ -22,8 +21,7 @@ packages{
     'ffac-ssid-changer',
     'ffbs-collect-debug-info',
     'ffbs-parker-nextnode',
-    'ffbs-parker-nodeconfig-respondd',
-    'ffbs-parker-nodeconfig',
+    'ffbs-mesh-vpn-parker',
     'ffbs-wireguard-respondd',
     '-gluon-ebtables-limit-arp',
     'iwinfo',
diff --git a/modules b/modules
index 37969435..c794b709 100644
--- a/modules
+++ b/modules
@@ -8,10 +8,10 @@
 #		documented below
 GLUON_SITE_FEEDS='community packages_ffbs'
 
-PACKAGES_COMMUNITY_REPO=https://github.com/SmithChart/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=163b332513c523eda0672a1ce155fae690431e81
-PACKAGES_COMMUNITY_BRANCH=topic/parker
+PACKAGES_COMMUNITY_REPO=https://github.com/ffac/community-packages.git
+PACKAGES_COMMUNITY_COMMIT=55ccb2d70f69916c3440ed717db0521f15aeafe7
+PACKAGES_COMMUNITY_BRANCH=parker
 
 PACKAGES_PACKAGES_FFBS_REPO=https://gitli.stratum0.org/ffbs/ffbs-packages.git
-PACKAGES_PACKAGES_FFBS_COMMIT=e378f415b42e0ea9744397f5b349fbe0ee9c7394
+PACKAGES_PACKAGES_FFBS_COMMIT=3b05fcb89a21f7492172c2241d2be9387de62b1f
 PACKAGES_PACKAGES_FFBS_BRANCH=v2023.2.x-ffbs-next