kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

clean out comments

Browse source 
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
This commit is contained in:
Kiara Grouwstra 2025-10-25 19:41:12 +02:00
parent 87ceb8a081
commit 23bcca8e67
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
3 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
deployment/check/data-model-tf-proxmox/nixosTest.nix
View file

@ -15,7 +15,6 @@ let
TF_HTTP_UNLOCK_ADDRESS = TF_HTTP_ADDRESS; TF_HTTP_UNLOCK_ADDRESS = TF_HTTP_ADDRESS;
TF_HTTP_ADDRESS = "http://localhost:${backendPort}/state/${fragment}"; TF_HTTP_ADDRESS = "http://localhost:${backendPort}/state/${fragment}";
}; };
# FIXME generate the image `nixos-generate` was to make, but now do it for a desired `-c configuration.nix` rather than whatever generic thing now
template-deployment = template-deployment =
(import ./setups/template.nix { (import ./setups/template.nix {
inherit sources system modulesPath; inherit sources system modulesPath;

7
deployment/run/tf-proxmox-template/main.tf
View file

@ -30,13 +30,6 @@ data "external" "hash" {
program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ../../..)\\\"}\""] program = ["sh", "-c", "echo \"{\\\"hash\\\":\\\"$(nix-hash ../../..)\\\"}\""]
} }
# FIXME (un)stream
# FIXME handle known-hosts in TF state
# FIXME move to host
# FIXME switch to base image shared between jobs as upload seems a bottleneck? e.g. by:
# - recursive TF
# - hash in name over overwrite
# won't notice file changes: https://github.com/bpg/terraform-provider-proxmox/issues/677
resource "proxmox_virtual_environment_file" "upload" { resource "proxmox_virtual_environment_file" "upload" {
depends_on = [ depends_on = [
data.external.hash, data.external.hash,

9
deployment/run/tf-proxmox-vm/main.tf
View file

@ -14,15 +14,10 @@ provider "proxmox" {
endpoint = "https://${var.host}:8006/" endpoint = "https://${var.host}:8006/"
# used only for files and creating custom disks # used only for files and creating custom disks
# FIXME handle known-hosts in TF state
ssh { ssh {
agent = true agent = true
# uncomment and configure if using api_token instead of password
username = "root" username = "root"
# node {
# name = "${var.node_name}"
# address = "${var.host}"
# # port = 22
# }
} }
} }
@ -34,8 +29,6 @@ data "external" "hash" {
resource "proxmox_virtual_environment_vm" "nix_vm" { resource "proxmox_virtual_environment_vm" "nix_vm" {
lifecycle { lifecycle {
# wait, would this not disseminate any changes to this property,
# or just defer syncing when only this changed?
ignore_changes = [ ignore_changes = [
disk["import_from"], disk["import_from"],
initialization, initialization,