modules: add ffdon-domain-merge

freifunkMUC · Dec 4, 2023 · 0137fbf · 0137fbf
1 parent 0baea0a
commit 0137fbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules b/modules
@@ -10,15 +10,15 @@ GLUON_SITE_FEEDS='eolssid ssidchanger ffmuc wireguard'
 
 ##	PACKAGES_FFMUC_REPO
 #		the  git repository from where to clone the package feed
-PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_REPO=https://github.com/grische/gluon-packages.git
 
 ##	PACKAGES_FFMUC_COMMIT
 #		the version/commit of the git repository to clone
-PACKAGES_FFMUC_COMMIT=403526c6881f62d7258292b9b6170dc4124c4078
+PACKAGES_FFMUC_COMMIT=0c238511c5c4f2f00151899b472edbe5986de5f7
 
 ##  PACKAGES_FFMUC_BRANCH
 #   the branch to check out
-PACKAGES_FFMUC_BRANCH=main
+PACKAGES_FFMUC_BRANCH=test/merge-prs
 
 ##	PACKAGES_WIREGUARD_REPO
 #		the  git repository from where to clone the package feed

diff --git a/site.mk b/site.mk
@@ -33,6 +33,7 @@ GLUON_MULTIDOMAIN=1
 
 GLUON_SITE_PACKAGES := \
 	ffac-eol-ssid \
+	ffdon-domain-merge \
 	ffho-ap-timer \
 	ffho-autoupdater-wifi-fallback \
 	ffho-web-ap-timer \