From 848bdf88aea3590f929b4288b81348051618eb91 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth.hunt@simponic.xyz>
Date: Sun, 7 Apr 2024 22:02:52 -0400
Subject: [PATCH] update dns

---
 group_vars/all.yml                         | 5 +++--
 roles/mail/templates/docker-compose.yml.j2 | 6 +++---
 roles/vpn/templates/config.yml.j2          | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 0bfa2e0..2f31a50 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -5,8 +5,9 @@ nijika_ip: '100.64.0.2'
 nameserver_ip: '10.155.0.1'
 
 dns_servers:
-  - 1.1.1.1
-  - 1.0.0.1
+  - "{{ nameserver_ip }}"
+  - '1.1.1.1'
+  - '1.0.0.1'
 dns_dnssec: true
 dns_domains: ["simponic.xyz"]
 dns_stub_listener: false
diff --git a/roles/mail/templates/docker-compose.yml.j2 b/roles/mail/templates/docker-compose.yml.j2
index 08524e4..5fe8083 100644
--- a/roles/mail/templates/docker-compose.yml.j2
+++ b/roles/mail/templates/docker-compose.yml.j2
@@ -9,7 +9,7 @@ services:
       - "465:465"
       - "587:587"
       - "993:993"
-      - "0.0.0.0:4190:4190"
+      - "4190:4190"
     volumes:
       - ./docker-data/dms/mail-data/:/var/mail/
       - ./docker-data/dms/mail-state/:/var/mail-state/
@@ -43,8 +43,8 @@ services:
       - SASLAUTHD_MECHANISMS=rimap
       - SASLAUTHD_MECH_OPTIONS=127.0.0.1
       - POSTMASTER_ADDRESS={{ postmaster_email }}
-    dns:
-      - {{ nameserver_ip }}
     extra_hosts:
       - "lldap.internal.simponic.xyz:{{ johan_ip }}"
+    dns:
+      - {{ nameserver_ip }}
     restart: always
diff --git a/roles/vpn/templates/config.yml.j2 b/roles/vpn/templates/config.yml.j2
index 88393a2..8f6161e 100644
--- a/roles/vpn/templates/config.yml.j2
+++ b/roles/vpn/templates/config.yml.j2
@@ -202,10 +202,12 @@ dns_config:
   #     - 1.1.1.1
   #     - 8.8.8.8
   restricted_nameservers:
-    internal.simponic.xyz:
+    simponic.xyz:
       - {{ nameserver_ip }}
     hatecomputers.club:
       - {{ nameserver_ip }}
+    ezri.dev:
+      - {{ nameserver_ip }}
 
   domains: ['simponic.xyz', 'internal.simponic.xyz']