From 04440efa090d160c5c7bd7462e251438083d1b23 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 20 Jun 2022 17:55:58 +0200
Subject: [PATCH] Feat: switch to tiny-cloud

---
 overlay/zdt/configs/access.conf.age         | Bin 602 -> 0 bytes
 overlay/zdt/configs/common-packages.conf    |   4 +--
 overlay/zdt/configs/zdt.conf                |   3 ++-
 overlay/zdt/scripts/setup-common            |   3 +++
 overlay/zdt/scripts/setup.d/tiny.init-final |  28 ++++++++++++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)
 delete mode 100644 overlay/zdt/configs/access.conf.age
 create mode 100644 overlay/zdt/scripts/setup.d/tiny.init-final

diff --git a/overlay/zdt/configs/access.conf.age b/overlay/zdt/configs/access.conf.age
deleted file mode 100644
index c69a60c9ca9d78ec63e4ce7e8b1df3a2cbfa2807..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 602
zcmV-g0;T<7XJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zV~OnOf_b89qsG;mmU
zQ*cZ%D@trtSwll?a!qbSL~mCxaauG(NlQpKL~ja5czIM+Mmcj*Pf&GNYG`avNlh<!
zNHS1nFJ^aAdPG+_S#fzXO;~a`Mr#T!EiE8qIdX48XizI;cW-D%XINx5HF7p*WmaNX
zXK-z0cT+N9P&F%VNOe_OF*pit4xhTI(Si9O&2;ON8*%z054bJ+6llV8;w~mXl${9C
z)fOSj94{pQne~^nZzgQNV69Qsp-fmt7pe@7cp2Gx`<OSvOfFJa%&zUl;xl^CZ@9ak
z76mScUHU7=sTuK&Ny5;ev`4z;CrYcBovc(Tmx9>2UB<6{F!PWQ0ZJ`D+U%B0ZWh;`
zY~DN@@{<l2#Ed_-HZM#3fW(19J0cW)0Ut|>Mit)i-Ttn=ca*CVmJYb&&0xh2cs=|}
zPgI6TO#BXJ5gS1rkWfTIm?@kB0#A=a`svB`%`mO<;~hrr62l))c5jc%Yb8~aXmlG%
z9lnM$_l96F+=U@7W|oEId8JH55`q^1aWyaecx^a7)P;V_bf0A(yD`z<Mei%_Cy?Bw
zlBf?Lnz%2qaL*yJJOxPcLOZR2e!#<)(9P5uI=YR1MJa1+QZu^@JkVw294-Cg>=m8S
zjt%?T;?6H?aK}ZzC?vxR2H|c|!>N3!iNiwr<f{?W)lEPb((UcXEEO;gr`MTq;G~wB
o6Jz8^v5Wn@P_UaHL`uMK$^3ni*jZy1(*~F+*7hY)t%ApXj#|YFm;e9(

diff --git a/overlay/zdt/configs/common-packages.conf b/overlay/zdt/configs/common-packages.conf
index 58d4267..54541aa 100644
--- a/overlay/zdt/configs/common-packages.conf
+++ b/overlay/zdt/configs/common-packages.conf
@@ -2,7 +2,7 @@ bash            = true
 jq              = true
 yq              = true
 logrotate       = true
-iptables        = true
+nftables        = true
 syslog-ng-json  = true
 podman          = true
 wireguard-tools = true
@@ -12,5 +12,5 @@ ethtool         = true
 nvme-cli        = true
 xfsprogs        = true
 dhclient        = true
-# monit           = true
+#monit           = true
 # prometheus-node-exporter = true
diff --git a/overlay/zdt/configs/zdt.conf b/overlay/zdt/configs/zdt.conf
index 8cc63b6..e22f1b7 100644
--- a/overlay/zdt/configs/zdt.conf
+++ b/overlay/zdt/configs/zdt.conf
@@ -50,7 +50,8 @@ Dimensions {
     uefi { include required("firmware/uefi.conf") }
   }
   bootstrap {
-    cloudinit { include required("bootstrap/cloudinit.conf") }
+    #cloudinit { include required("bootstrap/cloudinit.conf") }
+    tiny { include required("bootstrap/tiny.conf") }
   }
   cloud {
     aws   { include required("cloud/aws.conf") }
diff --git a/overlay/zdt/scripts/setup-common b/overlay/zdt/scripts/setup-common
index 191a1fc..12ee501 100755
--- a/overlay/zdt/scripts/setup-common
+++ b/overlay/zdt/scripts/setup-common
@@ -38,6 +38,9 @@ echo 'Installed cloudbender shutdown hook'
 cp $SETUP/route53.py  $TARGET/usr/local/bin
 echo 'Installed route53.py'
 
+# use patched tiny-cloud until PR is merged
+cp $SETUP/tiny.init-final $TARGET/lib/tiny-cloud/init-final
+
 # ps_mem
 #wget https://raw.githubusercontent.com/pixelb/ps_mem/master/ps_mem.py
 #sed -i -e 's,#!/usr/bin/env python,#!/usr/bin/env python3,' ps_mem.py
diff --git a/overlay/zdt/scripts/setup.d/tiny.init-final b/overlay/zdt/scripts/setup.d/tiny.init-final
new file mode 100644
index 0000000..c9cf125
--- /dev/null
+++ b/overlay/zdt/scripts/setup.d/tiny.init-final
@@ -0,0 +1,28 @@
+# Tiny Cloud - Final Phase Functions
+# vim:set ts=4 et ft=sh:
+
+source /lib/tiny-cloud/init-common
+
+save_userdata() {
+    skip_action save_userdata && return
+
+    imds -e @userdata > "$TINY_CLOUD_VAR/$CLOUD_USERDATA"
+    gunzip -t "$TINY_CLOUD_VAR/$CLOUD_USERDATA" && mv "$TINY_CLOUD_VAR/$CLOUD_USERDATA" "$TINY_CLOUD_VAR/$CLOUD_USERDATA".gz && gunzip -k "$TINY_CLOUD_VAR/$CLOUD_USERDATA".gz
+}
+
+is_userdata_script() {
+    head -n1 "$TINY_CLOUD_VAR/$CLOUD_USERDATA" | grep -q '#!/'
+}
+
+run_userdata() {
+    skip_action run_userdata && return
+
+    local log="$TINY_CLOUD_LOGS/$CLOUD_USERDATA.log"
+    local exit="$TINY_CLOUD_LOGS/$CLOUD_USERDATA.exit"
+    local userdata="$TINY_CLOUD_VAR/$CLOUD_USERDATA"
+
+    chmod +x "$userdata"
+    { "$userdata" 2>& 1; echo $? > "$exit"; } | tee "$log"
+
+    return $(cat "$exit")
+}