From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 15 Dec 2018 18:33:19 +0000 (+0100)
Subject: Fix double encryption key retrieval, add sendonly mail servers.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/conditions?a=commitdiff_plain;h=7813a47d8633aa5f5b16b03047f25be83c3f5e47;p=config

Fix double encryption key retrieval, add sendonly mail servers.
---

diff --git a/all_new_2018/setup_scripts/setup_play.sh b/all_new_2018/setup_scripts/setup_play.sh
index 2d9849d..5c024ec 100755
--- a/all_new_2018/setup_scripts/setup_play.sh
+++ b/all_new_2018/setup_scripts/setup_play.sh
@@ -12,6 +12,7 @@ config_tree_prefix="${HOME}/config/all_new_2018"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
 
+./setup_sendonly.sh
 ./add_encryption_key.sh "${gpg_key}"
 config_tree_prefix="${HOME}/config/all_new_2018/"
 ./hardlink_etc.sh play
@@ -22,24 +23,7 @@ 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
 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.
diff --git a/all_new_2018/setup_scripts/setup_web.sh b/all_new_2018/setup_scripts/setup_web.sh
index 7adb62f..400aa22 100755
--- a/all_new_2018/setup_scripts/setup_web.sh
+++ b/all_new_2018/setup_scripts/setup_web.sh
@@ -7,6 +7,7 @@ setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
 
 ./hardlink_etc.sh web
+./setup_sendonly.sh
 sed -i "s/REPLACE_fqdn_ECALPER/$(hostname -f)/g" /etc/nginx/nginx.conf
 sed -i "s/REPLACE_fqdn_ECALPER/$(hostname -f)/g" /etc/gitweb.conf
 cd /var/