X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=all_new_2018%2Fsetup_plomlombot.sh;h=3c9efa341fd8f8cf11119e0390df0b39fdccb1b1;hb=b20927bac93b8e612be6c66e86c440e4d682bcda;hp=22cc4095e25015ece934bb2d6b14d3d22b3eb165;hpb=0bb3d0b74ff1eb4622b71ee7954cdcc9f036674b;p=config
diff --git a/all_new_2018/setup_plomlombot.sh b/all_new_2018/setup_plomlombot.sh
index 22cc409..3c9efa3 100755
--- a/all_new_2018/setup_plomlombot.sh
+++ b/all_new_2018/setup_plomlombot.sh
@@ -11,11 +11,27 @@ gpg_key="$1"
config_tree_prefix="${HOME}/config/all_new_2018/"
irclogs_dir=/var/www/html/irclogs
irclogs_pw_dir=/var/www/irclogs_pw
-cp "${config_tree_prefix}"/user_scripts/plomlombot_daemon.sh /home/plom/
+cp "${config_tree_prefix}"/user_files/plomlombot_daemon.sh /home/plom/
chown plom:plom /home/plom/plomlombot_daemon.sh
apt -y install screen python3-venv gnupg dirmngr
-su plom -c "gpg --no-tty --recv-key ${gpg_key}"
-# TODO: After this, we could in theory remove dirmngr if we only installed it just now.
+keyservers='sks-keyservers.net/ keys.gnupg.net'
+set +e
+while true; do
+ do_break=0
+ for keyserver in $(echo "${keyservers}"); do
+ su plom -c "gpg --no-tty --keyserver $keyserver --recv-key ${gpg_key}"
+ if [ $? -eq "0" ]; then
+ do_break=1
+ break
+ fi
+ echo "Attempt with keyserver ${keyserver} unsuccessful, trying other."
+ done
+ if [ "${do_break}" -eq "1" ]; then
+ break
+ fi
+done
+set -e
+# TODO: We may remove dirmngr here if only this script installed it.
su plom -c "cd && git clone /var/public_repos/plomlombot-irc"
systemctl enable /etc/systemd/system/plomlombot.service
service plomlombot start