From ca467c55d8bbd633870c1fcaff0677bc2c6eaa9f Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@labitat.dk>
Date: Sat, 29 Feb 2020 14:09:39 +0100
Subject: space_server: update to Fedora 31

---
 roles/space_server/bootstrap.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'roles/space_server/bootstrap.sh')

diff --git a/roles/space_server/bootstrap.sh b/roles/space_server/bootstrap.sh
index 218815e..44e47bd 100755
--- a/roles/space_server/bootstrap.sh
+++ b/roles/space_server/bootstrap.sh
@@ -36,12 +36,14 @@
 # mount -o noatime,ssd,compress=lzo,subvol=/home /dev/sda2 /home
 #
 # Run this script
+# ./roles/space_server/bootstrap.sh
 
 set -e
 set -x
 
-release=29
+release=31
 dest="/mnt/fedora$release"
+secrets='./secrets.yml'
 if [[ -e "$dest" ]]; then
   echo "Destination '$dest' already exists. Aborting." >&2
   exit 1
@@ -58,7 +60,7 @@ dnf \
   --disablerepo='*' \
   --enablerepo=fedora \
   --enablerepo=updates \
-  install glibc-langpack-en dnf git ansible python-unversioned-command
+  install glibc-langpack-en systemd-udev dnf git ansible
 
 for i in /var/lib/machines /var/lib/portables; do
   if [[ -d "$dest$i" ]]; then
@@ -68,17 +70,22 @@ for i in /var/lib/machines /var/lib/portables; do
   install -o root -g root -m755 -d "$dest$i"
 done
 
+if [[ -f "$secrets" ]]; then
+  install -o root -g root -m600 "$secrets" "$dest/root/secrets.yml"
+fi
+
 exec systemd-nspawn \
   -D "$dest" \
-  -M space \
+  -M space.labitat.dk \
   -E ANSIBLE_FORCE_COLOR=1 \
   --bind /boot \
   --bind /home \
   -- \
   ansible-pull \
-  -i space.labitat.dk, \
-  -c local \
-  -U 'https://github.com/labitat/labitat-ansible.git' \
-  space.yml
+    -i space.labitat.dk, \
+    -c local \
+    -U 'https://github.com/labitat/labitat-ansible.git' \
+    -d /root/ansible \
+    space.yml
 
 # vim: set ts=2 sw=2 et:
-- 
cgit v1.2.1