fort: Install all TALs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/fort-validator b/config/rootfiles/packages/fort-validator
index 629aab3451531bc2b446c8f901e6da28ce3fd617..a494e46a441a3596de067a30cd6f097e9b19c1b6 100644 (file)
--- a/config/rootfiles/packages/fort-validator
+++ b/config/rootfiles/packages/fort-validator
@@ -3,6 +3,13 @@ etc/fort/config.json
 etc/fort/config.json.example
 etc/rc.d/init.d/fort-validator
 usr/bin/fort
+usr/share/fort
+#usr/share/fort/tals
+#usr/share/fort/tals/afrinic.tal
+#usr/share/fort/tals/apnic.tal
+#usr/share/fort/tals/arin.tal
+#usr/share/fort/tals/lacnic.tal
+#usr/share/fort/tals/ripe-ncc.tal
 #usr/share/man/man8/fort.8
 var/ipfire/backup/addons/includes/fort-validator
 var/lib/fort

diff --git a/lfs/fort-validator b/lfs/fort-validator
index cb8ba8972be7deeac0aebf43f59f48fcaa1b0c7c..e3e1a563663afe29c8c04e33d4e563a97e1e253e 100644 (file)
--- a/lfs/fort-validator
+++ b/lfs/fort-validator
@@ -101,6 +101,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && install -m 0644 $(DIR_APP)/examples/config.json \
                /etc/fort/config.json.example
 
+       # Install TALs
+       mkdir -pv /usr/share/fort/tals
+       cd $(DIR_APP) && install -v -m 644 \
+               $(DIR_APP)/examples/tal/afrinic.tal \
+               $(DIR_APP)/examples/tal/apnic.tal \
+               $(DIR_APP)/examples/tal/arin.tal \
+               $(DIR_APP)/examples/tal/lacnic.tal \
+               $(DIR_APP)/examples/tal/ripe-ncc.tal \
+               /usr/share/fort/tals
+
        # Install initscripts
        $(call INSTALL_INITSCRIPTS,$(SERVICES))
 

diff --git a/src/initscripts/packages/fort-validator b/src/initscripts/packages/fort-validator
index 788050009caa48fbf4c58f731acdce197bc7ba5e..22bcc59557729f1c5192538c3c82103ec417c1bc 100644 (file)
--- a/src/initscripts/packages/fort-validator
+++ b/src/initscripts/packages/fort-validator
@@ -29,6 +29,9 @@ ARGS=(
        # Log to syslog
        --log.output=syslog
        --validation-log.output=syslog
+
+       # Read TALs
+       --tal /usr/share/fort/tals
 )
 
 case "${1}" in