X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;f=all_new_2018%2Fsetup_plomlombot.sh;h=3c9efa341fd8f8cf11119e0390df0b39fdccb1b1;hb=60e6aeb6b26bd7b810deb8c53fe696022cb673b4;hp=1de8ae2d7d7d13f70593f3df3eea77afef20c2d9;hpb=f104d3d88085c7a3a7685411e622f21e7c68aaff;p=config

diff --git a/all_new_2018/setup_plomlombot.sh b/all_new_2018/setup_plomlombot.sh
index 1de8ae2..3c9efa3 100755
--- a/all_new_2018/setup_plomlombot.sh
+++ b/all_new_2018/setup_plomlombot.sh
@@ -11,25 +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
+apt -y install screen python3-venv gnupg dirmngr
 keyservers='sks-keyservers.net/ keys.gnupg.net'
 set +e
 while true; do
     do_break=0
-    for keyserver in $(echo "${keyservers}"; do
+    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