Fix irclogs location matching in nginx conf.

[config] / all_new_2018 / setup_plomlombot.sh

diff --git a/all_new_2018/setup_plomlombot.sh b/all_new_2018/setup_plomlombot.sh
index cf8a6797149d27fc7984f806204683ac6ddc15ae..fa8eab2156c6c9fd2b9d5ddd5a689d87073c985d 100755 (executable)
--- a/all_new_2018/setup_plomlombot.sh
+++ b/all_new_2018/setup_plomlombot.sh
@@ -1,14 +1,29 @@
 #!/bin/sh
 set -e
 
-config_tree_prefix="${HOME}/config/all_new_2018//"
-cp "${config_tree_prefix}"/user_scripts/start_plomlombot.sh /home/plom/
-chown plom:plom /home/plom/start_plomlombot.sh
-apt -y install screen python3-venv
-su plom -c "cd && git clone http://github.com/plomlompom/plomlombot-irc"
+# Ensure we have a GPG target to encrypt to.
+if [ $# -lt 1 ]; then
+    echo "Need public key ID as argument."
+    false
+fi
+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/
+chown plom:plom /home/plom/plomlombot_daemon.sh
+apt -y install screen python3-venv gpg dirmngr
+su plom -c "gpg --recv-key ${gpg_key}"
+# TODO: After this, we could in theory remove dirmngr if we only installed it just now.
+su plom -c "cd && git clone /var/public_repos/plomlombot-irc"
 systemctl enable /etc/systemd/system/plomlombot.service
 service plomlombot start
-mkdir -p /var/www/html/irclogs
-plomlompomtest_dir=/home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/789a38c5af11bb71833d89cd74387fcb/logs
-mkdir -p "${plomlompomtest_dir}"
-ln "${plomlompomtest_dir}" /var/www/html/irclogs/plomlompomtest
+mkdir -p "${irclogs_dir}"
+chown -R plom:plom "${irclogs_dir}"
+mkdir -p "${irclogs_pw_dir}"
+chown -R plom:plom "${irclogs_pw_dir}"
+echo "Don't forget to add a file ~/.plomlombot with content such as:"
+echo "gpg_key ${gpg_key}"
+echo "bot: SCREEN_SESSION_NAME BOT_NAME #CHANNEL_NAME IRC_SERVER_NAME LOGS_USER LOGS_PW"
+echo "# file should end in newline or non-interpreted line such as this"