From 83f994bb420e034296717d131f4eea07884bfdb3 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Thu, 6 Apr 2023 19:26:22 +0200
Subject: [PATCH] Move and rename stuff

---
 group_vars/all/vars.yml                          | 1 -
 roles/docker_services/defaults/main.yml          | 3 ++-
 roles/docker_services/tasks/services/postfix.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index de3f660..048a720 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -3,7 +3,6 @@
 ssh_key: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPd/4fQV7CL8/KVwbo/phiV5UdXFBIDlkZ+ps8C7FeRf
 hostname: pi
 timezone: Europe/Copenhagen
-base_domain: sapti.me
 
 hdd_name: storage
 hdd_mount_point: /opt/{{ hdd_name }}
diff --git a/roles/docker_services/defaults/main.yml b/roles/docker_services/defaults/main.yml
index f1af325..7765684 100644
--- a/roles/docker_services/defaults/main.yml
+++ b/roles/docker_services/defaults/main.yml
@@ -1,5 +1,6 @@
 # vim: ft=yaml.ansible
 ---
+base_domain: sapti.me
 base_volume: "{{ hdd_mount_point }}/apps"
 
 services:
@@ -8,8 +9,8 @@ services:
     version: 2-alpine
 
   postfix:
+    domain: smtp.{{ base_domain }}
     volume: "{{ base_volume }}/postfix"
-    hostname: smtp.{{ base_domain }}
     version: latest-alpine
 
   emby:
diff --git a/roles/docker_services/tasks/services/postfix.yml b/roles/docker_services/tasks/services/postfix.yml
index 635e345..b38365e 100644
--- a/roles/docker_services/tasks/services/postfix.yml
+++ b/roles/docker_services/tasks/services/postfix.yml
@@ -19,7 +19,7 @@
     restart_policy: always
     env:
       ALLOWED_SENDER_DOMAINS: "{{ sender_domains | join(' ') }}"
-      HOSTNAME: "{{ services.postfix.hostname }}"
+      HOSTNAME: "{{ services.postfix.domain }}"
       DKIM_AUTOGENERATE: "true"
     networks:
       - name: postfix