From a0b895cac6ae13d3a80be1c38d6b8d20f9f75830 Mon Sep 17 00:00:00 2001 From: Egor Gavrilov Date: Mon, 6 Jan 2025 20:48:03 +0300 Subject: [PATCH] Additional fixes in nodelist. --- golded/golded.Build | 2 +- golded/nodelist.sh | 2 ++ node/binkd.cfg.template-node | 2 +- setup_config.bash | 2 +- setup_node.bash | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/golded/golded.Build b/golded/golded.Build index c9f3df9..2d55b95 100755 --- a/golded/golded.Build +++ b/golded/golded.Build @@ -122,7 +122,7 @@ cp -a chsgen/* "$PKG"/usr/etc/golded+/ cp "$CWD"/golded.cfm "$PKG"/usr/etc/golded+/ mkdir -p "$PKG"/fido mkdir -p "$PKG"/fido/nodelist -cp "$CWD"/nodelist.txt "$PKG"/fido/nodelist/ +cp "$CWD"/nodelist.[0-9][0-9][0-9] "$PKG"/fido/nodelist/ cp "$CWD"/goldnode.* "$PKG"/fido/nodelist/ cat "$CWD"/nodelist.sh | sed "s|INSTALLDIR|$HOMEDIR|g" > "$PKG"/usr/bin/nodelist.sh chmod +x "$PKG"/usr/bin/nodelist.sh diff --git a/golded/nodelist.sh b/golded/nodelist.sh index a001bee..4342f50 100755 --- a/golded/nodelist.sh +++ b/golded/nodelist.sh @@ -1,5 +1,7 @@ #!/bin/sh +rm INSTALLDIR/fido/nodelist/nodelist.[0-9][0-9][0-9] curl -O --output-dir INSTALLDIR/fido/nodelist/ "ftp://wfido.ru/nodehist/$(date +%Y)/nodelist.$(date +%j)" +chmod 644 INSTALLDIR/fido/nodelist/nodelist.[0-9][0-9][0-9] echo 'Updating golded nodelist index.' INSTALLDIR/usr/bin/gnlnx -C INSTALLDIR/usr/etc/golded+/golded.cfg diff --git a/node/binkd.cfg.template-node b/node/binkd.cfg.template-node index 31a8bab..0735c44 100755 --- a/node/binkd.cfg.template-node +++ b/node/binkd.cfg.template-node @@ -41,7 +41,7 @@ brakebox INSTALLDIR/fido/badarea prescan perl-hooks INSTALLDIR/usr/bin/nodelist.pl -perl-var nodelist fidonet:INSTALLDIR/fido/nodelist/nodelist.txt +perl-var nodelist fidonet:INSTALLDIR/fido/nodelist/nodelist.[0-9][0-9][0-9] perl-var magichost * # First and main link diff --git a/setup_config.bash b/setup_config.bash index c6ef468..b88db81 100755 --- a/setup_config.bash +++ b/setup_config.bash @@ -623,7 +623,7 @@ fi chmod 644 "$HOMEDIR"/fido/*.log chmod 644 "$HOMEDIR"/fido/*.hlp -chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.txt +chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.[0-9][0-9][0-9] chmod 644 "$HOMEDIR"/fido/nodelist/*.g* chmod 644 "$HOMEDIR"/usr/etc/*.cfg chmod 644 "$HOMEDIR"/usr/etc/*.conf-dist diff --git a/setup_node.bash b/setup_node.bash index 3d8e910..ebe87a7 100755 --- a/setup_node.bash +++ b/setup_node.bash @@ -754,7 +754,7 @@ set +e chmod 644 "$HOMEDIR"/fido/*.log chmod 644 "$HOMEDIR"/fido/*.txt chmod 644 "$HOMEDIR"/fido/*.hlp -chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.txt +chmod 644 "$HOMEDIR"/fido/nodelist/nodelist.[0-9][0-9][0-9] chmod 644 "$HOMEDIR"/fido/nodelist/*.g* chmod 644 "$HOMEDIR"/usr/etc/*.cfg chmod 644 "$HOMEDIR"/usr/etc/*.conf-dist