From e87b9e65793c8c3bb66d03f72c1f547dc2b8a340 Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Sun, 17 Mar 2024 17:55:24 +0000
Subject: [PATCH] Add import and etcd cluster creator

---
 Makefile                    | 13 +++++++++---
 creators/etcd-cluster.sh    | 41 +++++++++++++++++++++++++++++++++++++
 data/letsencrypt/public.crt | 28 ++++++++++++-------------
 3 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100755 creators/etcd-cluster.sh

diff --git a/Makefile b/Makefile
index 723bfe2..3cecd99 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,22 @@ all: oci
 
 oci: $(IMAGES)
 localbuild: $(BUILD_IDS)
+import: $(addsuffix /import,${IMAGES})
 
 # Build process
 %/${IMAGE_OUTPUT}: %/${BUILD_ID_OUT}
-	buildah push -f oci \
+	buildah push \
+		-f oci \
 		$(shell cat $<) \
-		oci-archive:$@:${DOMAIN}/$*:latest
+		oci-archive:$@:${DOMAIN}/$*:$(shell date +%s)
+
+%/${IMAGE_OUTPUT}/import: %/${IMAGE_OUTPUT}
+	buildah pull \
+		oci-archive:$<
 
 %/${BUILD_ID_OUT}: %/Containerfile
 	buildah build \
+		--jobs 0 \
 		--network=none \
 		--layers=true \
 		-t ${DOMAIN}/$*:latest \
@@ -37,7 +44,7 @@ localbuild: $(BUILD_IDS)
 clean:
 	-rm -rv ${IMAGES} ${BUILD_IDS}
 
-.PHONY: all localbuild oci clean
+.PHONY: all localbuild oci clean import
 .SUFFIXES:
 
 # Somehow GNU make forgets these are intermediates if not explicitly stated, feel free to look into it *shrug*
diff --git a/creators/etcd-cluster.sh b/creators/etcd-cluster.sh
new file mode 100755
index 0000000..323d263
--- /dev/null
+++ b/creators/etcd-cluster.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+OWNHOST="[::1]"
+
+podman run \
+	-d \
+	--network=host \
+	--name node-1 \
+	redxen.eu/daemons/etcd \
+		--name node-1 \
+		--listen-peer-urls 'https://[::]:2380' \
+		--initial-advertise-peer-urls "https://$OWNHOST:2380" \
+		--listen-client-urls 'https://[::]:2379' \
+		--advertise-client-urls "https://$OWNHOST:2379" \
+		--initial-cluster-state new \
+		--initial-cluster "node-1=https://$OWNHOST:2380,node-2=https://$OWNHOST:2381,node-3=https://$OWNHOST:2382"
+
+podman run \
+	-d \
+	--network=host \
+	--name node-2 \
+	redxen.eu/daemons/etcd \
+		--name node-2 \
+		--listen-peer-urls 'https://[::]:2381' \
+		--initial-advertise-peer-urls "https://$OWNHOST:2381" \
+		--listen-client-urls 'https://[::]:2378' \
+		--advertise-client-urls "https://$OWNHOST:2378" \
+		--initial-cluster-state new \
+		--initial-cluster "node-1=https://$OWNHOST:2380,node-2=https://$OWNHOST:2381,node-3=https://$OWNHOST:2382"
+
+podman run \
+	-d \
+	--network=host \
+	--name node-3 \
+	redxen.eu/daemons/etcd \
+		--name node-3 \
+		--listen-peer-urls 'https://[::]:2382' \
+		--initial-advertise-peer-urls "https://$OWNHOST:2382" \
+		--listen-client-urls 'https://[::]:2377' \
+		--advertise-client-urls "https://$OWNHOST:2377" \
+		--initial-cluster-state new \
+		--initial-cluster "node-1=https://$OWNHOST:2380,node-2=https://$OWNHOST:2381,node-3=https://$OWNHOST:2382"
diff --git a/data/letsencrypt/public.crt b/data/letsencrypt/public.crt
index 280a21f..05f5b61 100644
--- a/data/letsencrypt/public.crt
+++ b/data/letsencrypt/public.crt
@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
-MIIE6zCCA9OgAwIBAgISAyroq1OJKXG3l88KMp3IY2o/MA0GCSqGSIb3DQEBCwUA
+MIIE6zCCA9OgAwIBAgISAy/p3h/wo08W4wsYNslIELVmMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMzA3MjcwNzMzMjRaFw0yMzEwMjUwNzMzMjNaMBQxEjAQBgNVBAMT
+EwJSMzAeFw0yMzEwMTYxMjIyMjNaFw0yNDAxMTQxMjIyMjJaMBQxEjAQBgNVBAMT
 CXJlZHhlbi5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANeD0yl2
 aQaIK73GpBOA1JpdesESlCvjEw9g84uN8Yk4fG77wGcDZw1Ja4vrj9MBmzvnLMUe
 j5mizZP2L3eIgx3KKsuIT4hClGSR/oeN0cL93RUYAwZqW1q8NBuAxu1QPhXn82ZK
@@ -14,16 +14,16 @@ PIwzPDkx1+DgEji18Q8rc+Y0dXAwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA5h+v
 nYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMuby5s
 ZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8wIQYD
 VR0RBBowGIILKi5yZWR4ZW4uZXWCCXJlZHhlbi5ldTATBgNVHSAEDDAKMAgGBmeB
-DAECATCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AHoyjFTYty22IOo44FIe6YQW
-cDIThU070ivBOlejUutSAAABiZZ7NcIAAAQDAEcwRQIhAPK4My1iA6WnHRY01fyo
-GrcMVLpgOH+NUZ2Gh8BGVcWjAiBRSOIVj4tayJoRu9P4kvjLO0e/DChzayAI5eFL
-VpxA1gB1AOg+0No+9QY1MudXKLyJa8kD08vREWvs62nhd31tBr1uAAABiZZ7NasA
-AAQDAEYwRAIgItnDg5wciJP9Wfz8BJczQ1wsUuAL2ptceLF6H8ReWjYCICRoWuhj
-Q1dnO4uvvPdbCyIonZj9DA1Dd95Gvekbufw8MA0GCSqGSIb3DQEBCwUAA4IBAQA1
-MSzr3Llh01zwQQkCD06L4V9toiX1WuSsOri0TzFUwR3sIOeY+rijDPW3+xfymWrC
-N7VxzhseiXQ8V6mdJ1cNhuSoAyKs1PTSS156HqZA8Q2oIhgZ18vJIOkCq4DJvoh+
-pTDZYcKbseR1u2IcGkT32tR1tTpro3/5z8skKdcoWLDvVZIQMPszIoeeqOvoMtI8
-WJtVD/0ggHZUQiJ8HMsATkkGpJ/bOM+pMupP6QddQyH1gHqiT68R5iqlVPSln3fU
-tDFR/+vPQDhZS+z0GjPJHjxP9K/5T1NPwKSeK6fWEPP4MncuSYG9GZlIT9UPAK0u
-A0/MZiYNtQP+b6RPZbzF
+DAECATCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB1ANq2v2s/tbYin5vCu1xr6HCR
+cWy7UYSFNL2kPTBI1/urAAABizim4x8AAAQDAEYwRAIgJQdzMMJr9YZLo3CEw5K7
+cM8EhBue/QmJNNM9Tk3z+RkCIAjG4Ix37WGEAouSh/eutvyH0fx7Ry6I/+QKsS+5
+xUcZAHYAdv+IPwq2+5VRwmHM9Ye6NLSkzbsp3GhCCp/mZ0xaOnQAAAGLOKbjTgAA
+BAMARzBFAiBXQmNcEN2iIIYJjvKf0ZbFUYRzK8CrFk0iB5Qk08gPZAIhAP1ogV9F
+V3XsGB5iFjnLDpU75mrizxqNTO8w9uRZbZNmMA0GCSqGSIb3DQEBCwUAA4IBAQCZ
+m1idEdbYkq6g23rwl4RiwE4wFa4IIeCp632Cuv2SaD4tRBAyIXiAvi1bYpz/qN1A
+14e++ufnRu6pwjrKBSI8sZwZLqWapdRJFp09vJK+o1M7+2kO2dYG6HX4C95Mrkku
+yw87mrc0M8U8Uw2NIxGYwPn5QFLies6mSaP/eqVkXOIOaglxDMyPIOCBqTu0c/KV
+cIY77MCqAv9J7pSFAn76dHeLZEYP4hPP9JocVTYFEzv2ZCTyvWR0Icu4ujfp3FVa
+uJnr16oWSHLXAL8gkNYruktc6CbJcQezQWClVAdTXGc3+0hxz7eTlEs/8O16ocN/
+EgIR8Ef47UL9jhVX8cT7
 -----END CERTIFICATE-----