From 53686082fa2925dde989eed8b09e2d40b8c98f06 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Wed, 17 Feb 2021 14:08:27 +0000
Subject: [PATCH] Update fastd to use general config template

---
 .gitignore              |  1 -
 config/fastd/APKBUILD   | 26 ++++----------------------
 config/fastd/fastd.conf | 16 ++++++++++++++++
 openrc/fastd/APKBUILD   |  6 +++---
 openrc/fastd/conffile   |  2 +-
 5 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 config/fastd/fastd.conf

diff --git a/.gitignore b/.gitignore
index 4775079..5af8599 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,3 @@ config/gitea/redxen.ini
 config/dovecot/pgsql.conf
 config/postfix/pgsql-aliases.cf
 config/postfix/pgsql-users.cf
-config/fastd/crxn-router.conf
diff --git a/config/fastd/APKBUILD b/config/fastd/APKBUILD
index 5b0c5c7..295030f 100644
--- a/config/fastd/APKBUILD
+++ b/config/fastd/APKBUILD
@@ -2,30 +2,12 @@
 # Maintainer: Alex Denes <caskd@redxen.eu>
 _svcname=fastd
 _configpath="/etc/fastd/redxen"
-_cfgumask=400
+_cfgumask=600
 
 . ../APKBUILD-config.common
 
 pkgver=2021.02.09
-pkgrel=1
-subpackages="$pkgname-crxnrouter" # $pkgname-crxnclient" TODO
-source="
-	crxn-router.conf
-"
-	#crxn-client.conf
+pkgrel=3
+source="fastd.conf"
 
-package() {
-	mkdir -p "$pkgdir"
-}
-
-crxnrouter() {
-	provides="redxen-config-fastd"
-	install -Dm400 crxn-router.conf "$subpkgdir"/"$_configpath"/crxn.conf
-}
-
-crxnclient() {
-	provides="redxen-config-fastd"
-	install -Dm400 crxn-client.conf "$subpkgdir"/"$_configpath"/crxn.conf
-}
-
-sha512sums="f0c4dfd3c0cd6c00ece98f3be9c8b70c1654713167da20f12d9867737d9f98b7ee0286ad311e9bf31536d44632ba9dc4b659d9d42c047dba0a14169b32f3849c  crxn-router.conf"
+sha512sums="8743f56c32dd827b76c27ff5f2c634e7a76b59e275891ee7850109b6b08a3c26cfa6f789e5659e6f1148a55857c992511195b337c5773b9480fac5e116232fe2  fastd.conf"
diff --git a/config/fastd/fastd.conf b/config/fastd/fastd.conf
new file mode 100644
index 0000000..62492f2
--- /dev/null
+++ b/config/fastd/fastd.conf
@@ -0,0 +1,16 @@
+interface "crxn0";
+method "salsa2012+umac";
+bind any:2190;
+secret "";
+
+on up "
+ip -6 addr add fd8a:6111:3b1a:dddd::X/64 scope global dev $INTERFACE
+ip -6 route add fd8a:6111:3b1a:dddd::X/64 dev $INTERFACE protocol static
+ip link set $INTERFACE up
+";
+
+peer "peer0"
+{
+        remote ipv6 "" port 2190;
+        key "";
+}
diff --git a/openrc/fastd/APKBUILD b/openrc/fastd/APKBUILD
index 20a5cfc..5c80e84 100644
--- a/openrc/fastd/APKBUILD
+++ b/openrc/fastd/APKBUILD
@@ -5,8 +5,8 @@ _grpname=network
 
 . ../APKBUILD-openrc.common
 
-pkgver=2021.02.09
-pkgrel=1
+pkgver=2021.02.17
+pkgrel=0
 
 sha512sums="68699b730ca24994227c4487f5046e433ba82e475b9f586755e525f9b6c7da7346f6ac04bb17d370bfed7121bb660f11a8e243169e25af391f6d1e87928d9d77  runfile
-577bf722d5fe5dc093f48b1d893f9c987045d30f3c64e5f22f2366ab6974786615068a29bd50f729149d8e2603b98ab705888a6e8c51a0838ae93990ae62dd26  conffile"
+3f4756f813548b734110bf5460c1d9d386feb410438380340d4dcbb71d4092534bb6f715246e73c5a61dc8efbddf200b7608442d165d52ce47192af6df8b7082  conffile"
diff --git a/openrc/fastd/conffile b/openrc/fastd/conffile
index b83a6e4..5c133b8 100644
--- a/openrc/fastd/conffile
+++ b/openrc/fastd/conffile
@@ -1 +1 @@
-FASTD_CONF="/etc/fastd/redxen/crxn.conf" 
+FASTD_CONF="/etc/fastd/redxen/fastd.conf"