From c1ff6a06121dbe257542660dfa8283873d1f03e9 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Wed, 12 Apr 2023 18:19:10 +0200
Subject: [PATCH] tweaks

---
 inventory/host_vars/max.yml |  2 +-
 main.tf                     | 14 ++++++++------
 max.yml                     | 21 ++++++++++++++++-----
 roles/static/vars/main.yml  |  2 +-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/inventory/host_vars/max.yml b/inventory/host_vars/max.yml
index 11aa49f..55ff4c3 100644
--- a/inventory/host_vars/max.yml
+++ b/inventory/host_vars/max.yml
@@ -1,4 +1,4 @@
-base_data_dir: /data
+base_data_dir: /mnt/data
 base_service_dir: /srv
 
 # Additional open ports
diff --git a/main.tf b/main.tf
index 5837283..3743886 100644
--- a/main.tf
+++ b/main.tf
@@ -16,10 +16,12 @@ provider "libvirt" {
 }
 
 module "tf-datatest" {
-  source          = "git::https://git.pim.kunis.nl/home/tf-modules.git//debian"
-  name            = "max2"
-  domain_name     = "tf-max"
-  data_disk       = "/kvm/data/max-data"
-  fixed_address   = "192.168.30.66/24"
-  ansible_command = "ansible-playbook max.yml"
+  source            = "git::https://git.pim.kunis.nl/home/tf-modules.git//debian"
+  name              = "max2"
+  domain_name       = "tf-max"
+  data_disk         = "/kvm/data/max-data"
+  fixed_address     = "192.168.30.66/24"
+  ansible_command   = "ansible-playbook max.yml"
+  insecure_password = true
+  memory            = 1024 * 8
 }
diff --git a/max.yml b/max.yml
index b99e777..bd06bd8 100644
--- a/max.yml
+++ b/max.yml
@@ -8,18 +8,29 @@
       state: started
       port: 22
       host: max2.dmz
-      timeout: 10
+      timeout: 300
       connect_timeout: 300
       search_regex: OpenSSH
     delegate_to: localhost
   - name: Wait for cloud-init to finish
-    command:
-      cmd: cloud-init status --wait
+    shell:
+      cmd: "cloud-init status --wait"
     register: cloudinit
     changed_when: "'..' in cloudinit.stdout"
   - name: Gather facts
     setup:
 
   roles:
-    - {role: 'docker', tags: 'docker'}
-    - {role: 'traefik', tags: 'traefik'}
+    - {role: 'watchtower', tags: 'watchtower'}
+    - {role: 'forgejo', tags: 'forgejo'}
+    # - {role: 'syncthing', tags: 'syncthing'}
+    - {role: 'kms', tags: 'kms'}
+    - {role: 'cyberchef', tags: 'cyberchef'}
+      #- {role: 'radicale', tags: 'radicale'}
+    - {role: 'mastodon', tags: 'mastodon'}
+    - {role: 'seafile', tags: 'seafile'}
+    - {role: 'jitsi', tags: 'jitsi'}
+    - {role: 'freshrss', tags: 'freshrss'}
+    - {role: 'static', tags: 'static'}
+    - {role: 'inbucket', tags: 'inbucket'}
+    - {role: 'prometheus', tags: 'prometheus'}
diff --git a/roles/static/vars/main.yml b/roles/static/vars/main.yml
index 8838234..912dd02 100644
--- a/roles/static/vars/main.yml
+++ b/roles/static/vars/main.yml
@@ -1,3 +1,3 @@
 service_name: static
 service_dir: "{{ base_service_dir }}/{{ service_name }}"
-git_origin: "http://localhost:{{ internal_forgejo_port }}/pim/static.git"
+git_origin: "http://git.pim.kunis.nl/pim/static.git"