Add multiple server configuration. - annna - Annna the nice friendly bot. HTML git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/annna/ DIR Log DIR Files DIR Refs DIR Tags DIR README --- DIR commit 9f05b1afe3c9c74295646627b59868bc148a47d8 DIR parent 52ab923f2115d9efdc9b806dfa96e9fec1ec5b2c HTML Author: Annna Robert-Houdin <annna@bitreich.org> Date: Fri, 31 Dec 2021 13:19:43 +0100 Add multiple server configuration. * Reshuffle some bits for further expansion. Diffstat: M annna-start | 20 +++++++++++++++++++- M annna-start-main | 21 +++++++-------------- M annna-stop | 2 +- M phlog-index | 2 +- 4 files changed, 28 insertions(+), 17 deletions(-) --- DIR diff --git a/annna-start b/annna-start @@ -1,6 +1,24 @@ #!/bin/sh +set -x + export PATH="$PATH:/home/annna/bin" -annna-start-main +cfgbase="/home/annna/annna" +cd ${cfgbase} + +for server in $(find . -maxdepth 1 -type d | tail -n +2 | cut -c 3-); +do + [ ! -f ${server}/autoconnect ] && continue + + channels="$(cat ${server}/channels | tr '\n' ' ')" + + usetls=0 + [ -f ${server}/usetls ] && usetls=1 + + port=6697 + [ -f ${server}/port ] && port="$(cat ${server}/port)" + + annna-start-main "${server}" "${usetls}" "${port}" "${channels}" +done DIR diff --git a/annna-start-main b/annna-start-main @@ -4,18 +4,11 @@ set -x export PATH="$PATH:/home/annna/bin" -# #bitreich is a forward to #bitreich-en. Annna does not need to join it. -#channels="#bitreich #bitreich-con #bitreich-radio -# #bitreich-scm #bitreich-en #bitreich-de" -channels="#bitreich-con #bitreich-radio - #bitreich-scm #bitreich-en #bitreich-de - #bitreich-fr #bitreich-cooking - #bitreich-nl #bitreich-lawn #bitreich-it - #bitreich-tv #bitreich-meme #bitreich-books" -# Testing -#channels="#bitreich-scm" - -server="${1:-irc.bitreich.org}" +server="$1" +usetls="$2" +[ $usetls -gt 0 ] && tlsparam=" -t" +port="$3" +channels="$4" rm -rf $HOME/irc/${server} mkdir -p $HOME/irc/${server} @@ -38,11 +31,11 @@ export ircpass="$(sed -n 's/^pass: //p' $HOME/annna/${server}/irc-credentials.tx # -f "Annna Robert-Houdin" & if [ -n "${ircuser}" -a -n "${ircpass}" ]; then - ii -s "${server}" -v -t -p 6697 -n "$ircuser" \ + ii -s "${server}" -v${tlsparam} -p 6697 -n "$ircuser" \ -f "Annna Robert-Houdin" & iipid=$! else - ii -s "${server}" -v -t -p 6697 \ + ii -s "${server}" -v${tlsparam} -p 6697 \ -f "Annna Robert-Houdin" & iipid=$! fi DIR diff --git a/annna-stop b/annna-stop @@ -5,7 +5,7 @@ export PATH="$PATH:/home/annna/bin" +annna-stop-ii annna-stop-checker annna-stop-services -annna-stop-ii DIR diff --git a/phlog-index b/phlog-index @@ -128,7 +128,7 @@ cp lsr.new lsr.old { printf "/N_E_W_S/+1,\$-3d\n" - printf "?N_E_W_S?r !cat /home/annna/phlogs/agg.gph | head -n 256\n" + printf "?N_E_W_S?r !cat /home/annna/phlogs/agg.gph | head -n 1024\n" printf "w\nq\n" } | ed -s /br/gopher/news.gph