From 05ba489fc9ba2e7566098e90aa7c9c52b8484ec7 Mon Sep 17 00:00:00 2001
From: alarig <alarig@swordarmor.fr>
Date: Mon, 17 Feb 2020 12:59:32 +0100
Subject: [PATCH] net-misc/FORT-validator: JSON configuration

---
 .../FORT-validator-1.1.3.ebuild               |  6 +++++-
 net-misc/FORT-validator/Manifest              |  7 ++++---
 net-misc/FORT-validator/files/fort-confd      | 19 ++++++++++++-------
 .../FORT-validator/files/fort-config.json     | 10 ++++++++++
 net-misc/FORT-validator/files/fort-initd      |  6 ++++++
 5 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 net-misc/FORT-validator/files/fort-config.json

diff --git a/net-misc/FORT-validator/FORT-validator-1.1.3.ebuild b/net-misc/FORT-validator/FORT-validator-1.1.3.ebuild
index e9ef269..9f68c40 100644
--- a/net-misc/FORT-validator/FORT-validator-1.1.3.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.1.3.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 
 src_prepare() {
 	default
-	
+
 	eautoreconf
 }
 
@@ -47,6 +47,10 @@ src_install() {
 	emake DESTDIR="${D}" install
 	insinto /usr/share/${MY_PN}/tal
 	doins tal/*
+
+	dodir /etc/fort
+	insinto /etc/fort
+	newins "${FILESDIR}/fort-config.json" config.json
 }
 
 pkg_postinst() {
diff --git a/net-misc/FORT-validator/Manifest b/net-misc/FORT-validator/Manifest
index d00e44e..c146e88 100644
--- a/net-misc/FORT-validator/Manifest
+++ b/net-misc/FORT-validator/Manifest
@@ -1,4 +1,5 @@
-AUX fort-confd 226 BLAKE2B 226cfed1b974860094c3001b9ca8b68478e7377b4cf989ca0e93101a9ffd2993afb0ca6d80b58eeba153104e5c6e423d7bcf605570931a3de3ebb18d2d107252 SHA512 e7edc1c06c6d70f8813060bafe7b288ea310c73af6a13f5db3c0d332d2142c11091e239ec457b25a0710c2469c0e9aec9c333ae2db5fec3d2b419c7b1c5dd6c1
-AUX fort-initd 430 BLAKE2B 05347ac6b3a679721d3b85cf82d3de1d6b56c10eff687690d342e576a5b21ece6962a60ccff70164d41414f8f1d3113a66daa165d9258c568d6183ab067ce227 SHA512 8d9bdafd0d5060e0db04b87e323e6eb63288e6cf4cc91e29a42eea759902d36fc48ed4e7453bc4b6d4916c048e5f139406ce18f6da0c515d3d22eb9e0dc78a73
+AUX fort-confd 460 BLAKE2B 5731cbaa8865b6bc708fb6d6c58fa85f6936cac61c304daba2776dd328e9848e560a5fef3d8d8a10ed9708c96021f276d5723341474c07d3027227f85251c825 SHA512 f40c59714f0935daf1026c8efb63180aff0f2ece9b0b5274af9abc95e1163fea194b01e14522dabf9064ea17bf5d29aabe447c566f98ba868cbeddeabf0d7e2f
+AUX fort-config.json 144 BLAKE2B 68674502b9bcc9cccbe566224b730c81098bc4f6af2fb9b62c02712499aa2618049cafb431a7943699b946fb42fae5e979d205edeb6bc5e7cc121b09346ecacf SHA512 3faa68a2ba2d881a9d2413af53133b7e4ce72b4e0250e64c734ff1957d943435b32a012d271fd098e25d3b31afba0ae406dc1b27c2ac38964cf853d45f4dc1c1
+AUX fort-initd 791 BLAKE2B dba40c667d7e2f81ac383632bd81adfa7056cda13979585edba8c5236aa99f18fbbc1bec820eef2ad221662490b3a4196dedb6559342c15933d58447f5d53f14 SHA512 14832d09d8b28088e3fed6d631b90ea70bd520c6f47252f58055570338417bab95c2fa2c48061edd3543421f059e08020e48894d1f9cee6984c4082b563fa3f5
 DIST FORT-validator-1.1.3.tar.gz 383459 BLAKE2B 80523058fb7e7b7f8d8a1d3737321f33a1795ed7f659bd8f0f0f107df3abfd36508bff1bf03ee3964ba4ad61faa9df29ea19c81f4533666b5a01e2dabf904172 SHA512 6d34e96c1f1d710914593620e848281d427cfcbefddfe355be8b36fb3b3451bc48113c968ddc25c18ea6df23fb182e7bb4951743de2ab0aa8d84d764040ca617
-EBUILD FORT-validator-1.1.3.ebuild 1004 BLAKE2B 1daf660be91c446e1c65a2b41ba57f5142e0916169d4ef69a71011d19185dc146b03f65350d2a9a5bcba96e5facbe69b2b4a16b51b50690bf61794150b72d3d1 SHA512 a089d9d6210af971fb7648ce9e13c7ae27c721a08035e475677070b8d275e3567880918bfea8882967ec0c5d52487dadf03c751792fde1bb85abc214a6d02cc2
+EBUILD FORT-validator-1.1.3.ebuild 1091 BLAKE2B e2463fa5432773b5ab780382961f602349620da6cce467e0c05d7d06664ba9b950dd5f2b1e9dbab35835f2c423bf83020c39ef7300ae0c38412ea47c0d2c26ea SHA512 f31b3e3d6c9303c6a35e6019a9dd5f0d0e2ba8c2d8a1345b8ee921a7816cebe8665d63b76d72efe8c0de82c7a290c0e7eb60e89b5563a701dd209666725df6cd
diff --git a/net-misc/FORT-validator/files/fort-confd b/net-misc/FORT-validator/files/fort-confd
index 18b6f1b..9293675 100644
--- a/net-misc/FORT-validator/files/fort-confd
+++ b/net-misc/FORT-validator/files/fort-confd
@@ -1,10 +1,15 @@
 # /etc/init.d/fort
 
-# Options to pass to the routinator process
-# See routinator man for options
+# Options to pass to the fort process
+# See man fort for options
 
-FORT_BASEDIR="/var/lib/fort/"
-FORT_OPTS="--tal /usr/share/fort/tal/ \
-	--local-repository ${FORT_BASEDIR}
-	--log.output syslog
-	--server.address ::"
+# If you want to use commands arguments instead of the configuration file and
+# not the default TAL directory, please remove the comment for FORT_BASEDIR as
+# well
+
+#FORT_BASEDIR="/var/lib/fort/"
+#FORT_OPTS="--tal /usr/share/fort/tal/ \
+#	--local-repository ${FORT_BASEDIR}
+#	--log.output syslog
+#	--server.address ::"
+FORT_OPTS="--configuration-file /etc/fort/config.json"
diff --git a/net-misc/FORT-validator/files/fort-config.json b/net-misc/FORT-validator/files/fort-config.json
new file mode 100644
index 0000000..6fae02f
--- /dev/null
+++ b/net-misc/FORT-validator/files/fort-config.json
@@ -0,0 +1,10 @@
+{
+	"tal": "/usr/share/fort/tal/",
+	"local-repository": "/var/lib/fort/",
+	"server": {
+		"address": "::"
+	},
+	"log": {
+		"output": "syslog"
+	}
+}
diff --git a/net-misc/FORT-validator/files/fort-initd b/net-misc/FORT-validator/files/fort-initd
index 0b11c71..4044713 100644
--- a/net-misc/FORT-validator/files/fort-initd
+++ b/net-misc/FORT-validator/files/fort-initd
@@ -16,6 +16,12 @@ depend() {
 }
 
 start_pre() {
+	if [ -z "${FORT_BASEDIR}" ]; then
+		FORT_BASEDIR=$(awk -F '"' '/local-repository/ { print $4 }' \
+			/etc/fort/config.json)
+		FORT_BASEDIR="${FORT_BASEDIR:-/var/lib/fort/}"
+	fi
+
 	checkpath -d -m 0750 -o fort:fort ${FORT_BASEDIR}
 
 	if [ "${RC_CMD}" = "restart" ] ; then