Merge pull request 'chore: resize puppetdb disk size' (#38) from benvin/resize_disks into master

Reviewed-on: #38

.gitea/workflows/build.yaml

@@ -9,7 +9,7 @@ jobs:
     runs-on: almalinux-8
     container:
       image: git.unkin.net/unkin/almalinux9-actionsdind:latest
-      options: --privileged
+      options: "--privileged --volume /etc/pki/tls/vault:/etc/pki/tls/vault:ro"
 
     steps:
       - name: Checkout code
@@ -29,4 +29,5 @@ jobs:
         env:
           VAULT_ROLEID: ${{ secrets.TERRAFORM_INCUS_VAULT_ROLEID }}
         run: |
+          dnf install terraform -y
           make plan

.gitea/workflows/deploy.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: almalinux-8
     container:
       image: git.unkin.net/unkin/almalinux9-actionsdind:latest
-      options: --privileged
+      options: "--privileged --volume /etc/pki/tls/vault:/etc/pki/tls/vault:ro"
 
     steps:
       - name: Checkout code
@@ -23,4 +23,5 @@ jobs:
         env:
           VAULT_ROLEID: ${{ secrets.TERRAFORM_INCUS_VAULT_ROLEID }}
         run: |
+          dnf install terraform -y
           make apply

Makefile

@@ -15,14 +15,22 @@ define vault_env
 	export TG_TF_PATH=terraform && \
 	eval "$$(vault read -format=json kv/data/service/terraform/incus \
 	  | jq -r '.data.data | to_entries[] | "export \(.key)=\(.value|@sh)"')" && \
-	export INCUS_GLOBAL_CONF=$$(mktemp -d) && \
-	trap "rm -rf $$INCUS_GLOBAL_CONF" EXIT && \
-	mkdir -p $$INCUS_GLOBAL_CONF && \
-	mkdir -p $$INCUS_GLOBAL_CONF/servercerts && \
-	printf '%s\n' "$$INCUS_CONF_INCUSIMAGES_CERT" > $$INCUS_GLOBAL_CONF/servercerts/incus-images.crt && \
-	printf '%s\n' "$$INCUS_CONF_CONFIG_YAML" > $$INCUS_GLOBAL_CONF/config.yaml && \
-	printf '%s\n' "$$INCUS_CLIENT_CRT" > $$INCUS_GLOBAL_CONF/client.crt && \
-	printf '%s\n' "$$INCUS_CLIENT_KEY" > $$INCUS_GLOBAL_CONF/client.key
+	export INCUS_CONFIG_DIR=$$(mktemp -d) && \
+	trap "rm -rf $$INCUS_CONFIG_DIR" EXIT && \
+	mkdir -p $$INCUS_CONFIG_DIR && \
+	mkdir -p $$INCUS_CONFIG_DIR/servercerts && \
+	printf '%s\n' "$$INCUS_CONF_INCUSIMAGES_CERT" > $$INCUS_CONFIG_DIR/servercerts/incus-images.crt && \
+	printf '%s\n' "$$INCUS_CONF_CONFIG_YAML" > $$INCUS_CONFIG_DIR/config.yml && \
+	if [ -f /etc/pki/tls/vault/certificate.crt ] && [ -f /etc/pki/tls/vault/private.key ]; then \
+		cp /etc/pki/tls/vault/certificate.crt $$INCUS_CONFIG_DIR/client.crt && \
+		cp /etc/pki/tls/vault/private.key $$INCUS_CONFIG_DIR/client.key; \
+	elif [ -f $$HOME/.config/incus/client.crt ] && [ -f $$HOME/.config/incus/client.key ]; then \
+		cp $$HOME/.config/incus/client.crt $$INCUS_CONFIG_DIR/client.crt && \
+		cp $$HOME/.config/incus/client.key $$INCUS_CONFIG_DIR/client.key; \
+	else \
+		printf '%s\n' "$$INCUS_CLIENT_CRT" > $$INCUS_CONFIG_DIR/client.crt && \
+		printf '%s\n' "$$INCUS_CLIENT_KEY" > $$INCUS_CONFIG_DIR/client.key; \
+	fi
 endef
 
 clean:

config/globals/profiles.yaml

@@ -159,6 +159,16 @@ shared_apps_jellyfin:
       properties:
         source: /shared/apps/jellyfin
         path: /shared/apps/jellyfin
+shared_apps_maildata:
+  description: "Mount /shared/apps/maildata directly into the container"
+  project: null
+  config: {}
+  devices:
+    - type: disk
+      name: maildata-shared
+      properties:
+        source: /shared/apps/maildata
+        path: /shared/apps/maildata
 
 # storage
 disk10:

config/instances/ausyd1nxvm2000/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2001/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2002/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2003/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2004/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2005/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2006/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2007/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2008/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2009/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2010/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2011/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2012/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2013/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2014/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2015/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2016/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2017/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2018/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2019/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2020/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2021/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2022/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2023/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2024/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2025/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2026/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2027/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2028/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2029/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2030/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2031/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2032/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2033/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2034/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2035/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2036/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2037/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2038/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2039/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2040/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2041/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2042/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2043/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2044/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2045/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2046/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2047/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2048/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2049/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2050/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2051/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2052/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2053/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2054/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2055/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2056/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2057/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2058/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2059/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2060/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2061/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2062/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2063/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2064/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2065/config.yaml

@@ -10,4 +10,4 @@ storage_volumes:
     pool: fastpool
     path: /data
     config:
-      size: 50GB
+      size: 100GB

config/instances/ausyd1nxvm2065/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2066/config.yaml

@@ -10,4 +10,4 @@ storage_volumes:
     pool: fastpool
     path: /data
     config:
-      size: 50GB
+      size: 100GB

config/instances/ausyd1nxvm2066/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2067/config.yaml

@@ -10,4 +10,4 @@ storage_volumes:
     pool: fastpool
     path: /data
     config:
-      size: 50GB
+      size: 100GB

config/instances/ausyd1nxvm2067/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2068/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2069/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2070/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2071/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2072/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2073/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2074/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2075/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2076/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2077/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2078/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2079/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2080/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2081/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2082/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2083/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2084/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2085/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2086/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2087/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2088/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2089/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2090/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2091/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"

config/instances/ausyd1nxvm2092/terragrunt.hcl

@@ -35,6 +35,7 @@ generate "incus" {
     provider "incus" {
       generate_client_certificates = false
       accept_remote_certificate    = true
+      config_dir = "${get_env("INCUS_CONFIG_DIR")}"
 
       remote {
         name    = "${basename(get_terragrunt_dir())}"