X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=all_new_2018%2Fsetup_scripts%2Fsetup_plomlombot.sh;h=de22ef36d139669ae5977c4c9a1159cc24cbff9f;hb=17489120d557d9af614693ff6ee60a904ede4629;hp=5a45b6f036f5c3c71a7d6d5672c453dad6e4d2d6;hpb=eafecb0ed8c373dc4f33b6190375fdc3d5c4d841;p=config
diff --git a/all_new_2018/setup_scripts/setup_plomlombot.sh b/all_new_2018/setup_scripts/setup_plomlombot.sh
index 5a45b6f..de22ef3 100755
--- a/all_new_2018/setup_scripts/setup_plomlombot.sh
+++ b/all_new_2018/setup_scripts/setup_plomlombot.sh
@@ -11,27 +11,11 @@ gpg_key="$1"
config_tree_prefix="${HOME}/config/all_new_2018"
irclogs_dir=/var/www/html/irclogs
irclogs_pw_dir=/var/www/irclogs_pw
+
+./add_encryption_key.sh "${gpg_key}"
+apt -y install screen python3-venv
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
-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