From: Christian Heller <c.heller@plomlompom.de>
Date: Tue, 7 May 2019 11:31:37 +0000 (+0200)
Subject: Improve/fix secrets installation.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7Bprefix%7D%7D/add_free?a=commitdiff_plain;h=e28d643cdc94ab26ed36f5fdac63543f617f0256;p=config

Improve/fix secrets installation.
---

diff --git a/buster/home_files/user_eeepc/public_repos/repos b/buster/home_files/user_eeepc/public_repos/repos
index 138b841..27eb028 100644
--- a/buster/home_files/user_eeepc/public_repos/repos
+++ b/buster/home_files/user_eeepc/public_repos/repos
@@ -1,3 +1,4 @@
+# List of repos we want cloned in ~/public_repos
 config
 pingmail.git
 plomlombot-irc.git
diff --git a/buster/setup_scripts/setup_home_eeepc.sh b/buster/setup_scripts/setup_home_eeepc.sh
index c9703ec..74049de 100755
--- a/buster/setup_scripts/setup_home_eeepc.sh
+++ b/buster/setup_scripts/setup_home_eeepc.sh
@@ -19,13 +19,17 @@ ensure_repo() {
     fi
 }
 
+# Clone config to copy dotfiles etc. from it.
 cd
 mkdir -p "${public_repos_dir}"
 ensure_repo config
 cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_buster}/home_files" "${HOME}" minimal user_eeepc
+
+# Set up native messenger for tridactyl.
 curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/78e662efefd1f4af2bdb2a53edecf03b535b997b/native/install.sh | bash
 
+# Set up non-public parts of infrastructure.
 cd "${dir_secrets}"
 mkdir -p "${ssh_dir}"
 echo "Setting up .ssh"
@@ -39,8 +43,25 @@ mv borg_keyfiles/* "${borgkeys_dir}"
 cd
 rm -rf "${dir_secrets}"
 
+# Sync org dir via borgbackup. For this we need the borgbackup servers
+# in our .ssh/known_hosts file.
+cat "${borgconfig_file}" | while read line; do
+    first_char=$(echo "${line}" | cut -c1)
+    if [ "${first_char}" = "#" ]; then
+        continue
+    fi
+    ssh-keyscan "${line}" >> "${ssh_dir}"/known_hosts
+done
 "${path_borgscript}" orgpull
+
+# Fill ~/public_repos.
 cat "${repos_list_file}" | while read line; do
+    first_char=$(echo "${line}" | cut -c1)
+    if [ "${first_char}" = "#" ]; then
+        continue
+    fi
     ensure_repo "${line}"
 done
+
+# Final note on how to integrate tridactyl.
 echo "TODO: As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."