From 6d16e2e4ae9779bf9b759913876d045e706a1d72 Mon Sep 17 00:00:00 2001
From: June <june@jsts.xyz>
Date: Sun, 16 Feb 2025 23:40:59 +0100
Subject: [PATCH] make URL to use for downloading authorized_keys file
configurable
---
README.md | 15 ++++++++-------
build-proxmox-template | 3 ++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index 9bfac04..56bb5a0 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,14 @@ The following settings are available for configuration by setting the respective
Verify that the configured settings are suitable for the cluster you want to create the template for.
If left unset, the respective default value will be used.
-| Variable | Default | Description |
-| --------- | --------------------------------------- | ---------------------------------------------------------------------- |
-| `VMID` | 9023 | ID the template should have in Proxmox |
-| `STORAGE` | `local-zfs` | Pool the disks should be created in |
-| `OS` | `debian-12` | `virt-builder` name of the OS to install |
-| `NAME` | `chaos-${OS}-tmpl-$(date -u +%Y-%m-%d)` | name of the template |
-| `BRIDGE` | `vmbr0,tag=208` | name of the bridge to use and any parameters needed, like the VLAN tag |
+| Variable | Default | Description |
+| --------------------- | ----------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| `VMID` | 9023 | ID the template should have in Proxmox |
+| `STORAGE` | `local-zfs` | Pool the disks should be created in |
+| `OS` | `debian-12` | `virt-builder` name of the OS to install |
+| `NAME` | `chaos-${OS}-tmpl-$(date -u +%Y-%m-%d)` | name of the template |
+| `BRIDGE` | `vmbr0,tag=208` | name of the bridge to use and any parameters needed, like the VLAN tag |
+| `AUTHORIZED_KEYS_URL` | `https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys/raw/branch/trunk/authorized_keys` | URL to download the authorized_keys file to use from |
### User Account, sshd, and `authorized_keys`
diff --git a/build-proxmox-template b/build-proxmox-template
index b97855c..31d36ea 100755
--- a/build-proxmox-template
+++ b/build-proxmox-template
@@ -10,6 +10,7 @@
: "${OS:=debian-12}"
: "${NAME:=chaos-${OS}-tmpl-$(date -u +%Y-%m-%d)}"
: "${BRIDGE:=vmbr0,tag=208}"
+: "${AUTHORIZED_KEYS_URL:=https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys/raw/branch/trunk/authorized_keys}"
set -eE
@@ -27,7 +28,7 @@ cleanup() {
}
-wget -4 https://git.hamburg.ccc.de/CCCHH/infrastructure-authorized-keys/raw/branch/trunk/authorized_keys -O authorized_keys
+wget -4 "$AUTHORIZED_KEYS_URL" -O authorized_keys
wget https://cloud.debian.org/images/cloud/bookworm/latest/debian-12-generic-amd64.tar.xz -O debian-12-generic-amd64.tar.xz
wget https://cloud.debian.org/images/cloud/bookworm/latest/SHA512SUMS -O SHA512SUMS
sha512sum --ignore-missing -c SHA512SUMS