From 2bfaa72d81a354611531501d57acb6fe6bfb40f1 Mon Sep 17 00:00:00 2001
From: fenix-gitea-admin <danieldanieldanielg2@gmail.com>
Date: Wed, 27 Aug 2025 19:00:51 +0000
Subject: [PATCH 1/3] Update cloud-init-vm.yaml.tftpl

---
 cloud-init-vm.yaml.tftpl | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/cloud-init-vm.yaml.tftpl b/cloud-init-vm.yaml.tftpl
index e0a25a9..346d10e 100644
--- a/cloud-init-vm.yaml.tftpl
+++ b/cloud-init-vm.yaml.tftpl
@@ -3,23 +3,28 @@ package_update: true
 %{ if length(each.value.extra_packages) > 0 }
 packages:
 %{ for pkg in each.value.extra_packages }
-  - ${pkg}
+${" "}- ${pkg}
 %{ endfor }
 %{ endif }
 
 %{ if length(each.value.extra_users) > 0 }
 users:
 %{ for u in each.value.extra_users }
-  - name: ${u.name}
-    groups: [${join(", ", u.groups)}]
-    shell: /bin/bash
-    sudo: ALL=(ALL) NOPASSWD:ALL
+${" "}- name: ${u.name}
+${" "}${" "}groups: 
+%{ if length(u.groups) > 0 }
+%{ for g in u.groups }
+${" "}${" "}${" "}- ${g}
+%{ endfor }
+%{ endif }
+${" "}${" "}shell: /bin/bash
+${" "}${" "}sudo: ALL=(ALL) NOPASSWD:ALL
 %{ endfor }
 
 chpasswd:
   list: 
 %{ for u in each.value.extra_users }
-    ${u.name}:${u.password}
+${" "}${" "}- ${u.name}:${u.password}
 %{ endfor }
   expire: false
 %{ endif }

From 82243fa145ab903b7824e8a5b5a1ce9720910556 Mon Sep 17 00:00:00 2001
From: fenix-gitea-admin <danieldanieldanielg2@gmail.com>
Date: Wed, 27 Aug 2025 19:02:17 +0000
Subject: [PATCH 2/3] Update cloud-init-vm.yaml.tftpl

---
 cloud-init-vm.yaml.tftpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cloud-init-vm.yaml.tftpl b/cloud-init-vm.yaml.tftpl
index 346d10e..0738456 100644
--- a/cloud-init-vm.yaml.tftpl
+++ b/cloud-init-vm.yaml.tftpl
@@ -3,28 +3,28 @@ package_update: true
 %{ if length(each.value.extra_packages) > 0 }
 packages:
 %{ for pkg in each.value.extra_packages }
-${" "}- ${pkg}
+  - ${pkg}
 %{ endfor }
 %{ endif }
 
 %{ if length(each.value.extra_users) > 0 }
 users:
 %{ for u in each.value.extra_users }
-${" "}- name: ${u.name}
-${" "}${" "}groups: 
+  - name: ${u.name}
+    groups: 
 %{ if length(u.groups) > 0 }
 %{ for g in u.groups }
-${" "}${" "}${" "}- ${g}
+      - ${g}
 %{ endfor }
 %{ endif }
-${" "}${" "}shell: /bin/bash
-${" "}${" "}sudo: ALL=(ALL) NOPASSWD:ALL
+    shell: /bin/bash
+    sudo: ALL=(ALL) NOPASSWD:ALL
 %{ endfor }
 
 chpasswd:
   list: 
 %{ for u in each.value.extra_users }
-${" "}${" "}- ${u.name}:${u.password}
+    - ${u.name}:${u.password}
 %{ endfor }
   expire: false
 %{ endif }

From 013518813fa82e0b5c63071ffcaf44d96a325b79 Mon Sep 17 00:00:00 2001
From: fenix-gitea-admin <danieldanieldanielg2@gmail.com>
Date: Wed, 27 Aug 2025 19:06:39 +0000
Subject: [PATCH 3/3] Update merge_yaml.py

---
 merge_yaml.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/merge_yaml.py b/merge_yaml.py
index a7c1d81..dc1f033 100644
--- a/merge_yaml.py
+++ b/merge_yaml.py
@@ -40,8 +40,16 @@ def main():
             raise e
 
 
-    merged = deep_merge_yaml(yaml1, yaml2)
-    print(json.dumps({"merged_yaml": yaml.dump(merged, sort_keys=False)}))
+    merged = deep_merge_yaml(yaml1, yaml2)    
+    print(json.dumps({
+        "merged_yaml": yaml.dump(
+            merged,
+            sort_keys=False,
+            default_flow_style=False,
+            indent=2
+        )
+    }))
+
 
 if __name__ == "__main__":
     main()