From d80fd6fd5f0a19ecd40bb3ecbf11c7d24fb93b76 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Tue, 9 Sep 2025 05:42:12 -0700 Subject: [PATCH] fix(prox): setup --- ci/hostname.sh | 2 +- ci/proxmox/setup.sh | 4 ++++ tf/proxmox_meiling.tf | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ci/hostname.sh b/ci/hostname.sh index a0f7000a..02000a52 100644 --- a/ci/hostname.sh +++ b/ci/hostname.sh @@ -41,4 +41,4 @@ if ! ping -w${ARG_TIMEOUT} -c1 "$ARG_HOSTNAME" >/dev/null 2>&1; then fi fi -echo "${DEPLOY_USER-}${DEPLOY_USER+@}$ARG_HOSTNAME" +echo "${DEPLOY_USER-}${DEPLOY_USER:+@}$ARG_HOSTNAME" diff --git a/ci/proxmox/setup.sh b/ci/proxmox/setup.sh index e7663fc6..a809c6b3 100644 --- a/ci/proxmox/setup.sh +++ b/ci/proxmox/setup.sh @@ -61,6 +61,10 @@ TF_ROLE_PRIVS=( pveum role add Terraform --privs "${TF_ROLE_PRIVS[*]}" pveum acl modify / --users tf@pam --roles Terraform +if ! which sudo; then + apt install sudo || true +fi + INFRABIN=/opt/infra/bin WRAPPERBIN=/opt/infra/sbin SUDOERS_INFRABINS= diff --git a/tf/proxmox_meiling.tf b/tf/proxmox_meiling.tf index e0d456a1..88d0de40 100644 --- a/tf/proxmox_meiling.tf +++ b/tf/proxmox_meiling.tf @@ -2,9 +2,9 @@ locals { meiling_int_prefix4 = "10.9.2.0/24" meiling_int_prefix6 = "fd0c:0:0:2::/64" meiling_int_offset = 32 - meiling_int_addr4 = local.systems.meiling.network.networks.int.address4 + meiling_int_addr4 = local.systems.meiling.network.networks.int.address4 #meiling_int_bridge = proxmox_virtual_environment_network_linux_bridge.meiling_internal.name - meiling_int_bridge = "vmbr9" + meiling_int_bridge = "vmbr9" proxmox_meiling_connection = { type = "ssh"