Improve play server setup script.

[config] / all_new_2018 / setup_scripts / setup_play.sh

diff --git a/all_new_2018/setup_scripts/setup_play.sh b/all_new_2018/setup_scripts/setup_play.sh
index 020c13de2db6bb252f148f9f2c034ed6ad1150f9..a226ca0bc12c0ddc9397f4d2060d0472dd24930b 100755 (executable)
--- a/all_new_2018/setup_scripts/setup_play.sh
+++ b/all_new_2018/setup_scripts/setup_play.sh
@@ -12,35 +12,23 @@ config_tree_prefix="${HOME}/config/all_new_2018"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
 
-config_tree_prefix="${HOME}/config/all_new_2018/"
-./hardlink_etc.sh play
+./setup_sendonly.sh
+
+./add_encryption_key.sh "${gpg_key}"
 apt -y install weechat screen vim
-cp "${config_tree_prefix}user_files/encrypter.sh" /home/plom/
+
+# Link and copy over files.
+./hardlink_etc.sh play
+cp "${config_tree_prefix}/user_files/encrypter.sh" /home/plom/
 chown plom:plom /home/plom/encrypter.sh
-cp "${config_tree_prefix}user_files/weechat-wrapper.sh" /home/plom/
+cp "${config_tree_prefix}/user_files/weechat-wrapper.sh" /home/plom/
 chown plom:plom /home/plom/weechat-wrapper.sh
-cp "${config_tree_prefix}user_files/weechatrc" /home/plom/.weechatrc
+cp "${config_tree_prefix}/user_files/weechatrc" /home/plom/.weechatrc
 chown plom:plom /home/plom/.weechatrc
-apt -y install screen 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
+apt -y install screen
 echo "$gpg_key" > /home/plom/.encrypt_target
 chown plom:plom /home/plom/.encrypt_target
-# TODO: We may remove dirmngr here if only this script installed it.
+
+# Start encrypt_chatlogs job.
 systemctl daemon-reload
 systemctl start encrypt_chatlogs.timer