summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Hunt <elizabeth.hunt@simponic.xyz>2024-03-31 16:42:46 -0400
committerElizabeth Hunt <elizabeth.hunt@simponic.xyz>2024-03-31 16:42:46 -0400
commitb566e9385082678bc2f75e0712d856fa1c64c94c (patch)
treecc60420a5c1383f24ff9b7e0cbcd838969b004a0
parenteb01bd2c61dd1d85620654ccb8f331a70bc9ac83 (diff)
downloadoldinfra-b566e9385082678bc2f75e0712d856fa1c64c94c.tar.gz
oldinfra-b566e9385082678bc2f75e0712d856fa1c64c94c.zip
use hatecomupters.club internal dns
-rw-r--r--group_vars/all.yml2
-rw-r--r--group_vars/ca.yml2
-rw-r--r--roles/authelia/templates/docker-compose.yml.j22
-rw-r--r--roles/gitea/templates/docker-compose.yml.j22
-rw-r--r--roles/mail/templates/docker-compose.yml.j22
-rw-r--r--roles/roundcube/templates/docker-compose.yml.j22
-rw-r--r--roles/vpn/templates/config.yml.j22
7 files changed, 8 insertions, 6 deletions
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 0c458b9..0bfa2e0 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -2,6 +2,8 @@
johan_ip: '100.64.0.5'
nijika_ip: '100.64.0.2'
+nameserver_ip: '10.155.0.1'
+
dns_servers:
- 1.1.1.1
- 1.0.0.1
diff --git a/group_vars/ca.yml b/group_vars/ca.yml
index 9ef5c52..6171512 100644
--- a/group_vars/ca.yml
+++ b/group_vars/ca.yml
@@ -1,6 +1,6 @@
---
step_ca_root_password: "{{ lookup('env', 'STEP_CA_ROOT_PASSWORD') }}"
step_ca_intermediate_password: "{{ lookup('env', 'STEP_CA_INTERMEDIATE_PASSWORD') }}"
-step_ca_dns: "{{ step_bootstrap_ca_url }}, {{ johan_ip }}"
+step_ca_dns: "{{ step_bootstrap_ca_url }}, {{ johan_ip }}, {{ nameserver_ip }}"
step_ca_name: Simponic Internal CA
step_ca_address: ":{{ step_ca_port }}"
diff --git a/roles/authelia/templates/docker-compose.yml.j2 b/roles/authelia/templates/docker-compose.yml.j2
index aa53bb9..e36296f 100644
--- a/roles/authelia/templates/docker-compose.yml.j2
+++ b/roles/authelia/templates/docker-compose.yml.j2
@@ -10,7 +10,7 @@ services:
- 127.0.0.1:9091:9091
restart: unless-stopped
dns:
- - {{ johan_ip }}
+ - {{ nameserver_ip }}
redis:
image: redis:alpine
container_name: redis
diff --git a/roles/gitea/templates/docker-compose.yml.j2 b/roles/gitea/templates/docker-compose.yml.j2
index 7be1c0f..b9d410c 100644
--- a/roles/gitea/templates/docker-compose.yml.j2
+++ b/roles/gitea/templates/docker-compose.yml.j2
@@ -19,4 +19,4 @@ services:
- "127.0.0.1:9966:3000"
- "{{ nijika_ip }}:222:22"
dns:
- - {{ johan_ip }}
+ - {{ nameserver_ip }}
diff --git a/roles/mail/templates/docker-compose.yml.j2 b/roles/mail/templates/docker-compose.yml.j2
index c245da4..a624a56 100644
--- a/roles/mail/templates/docker-compose.yml.j2
+++ b/roles/mail/templates/docker-compose.yml.j2
@@ -42,5 +42,5 @@ services:
- SASLAUTHD_MECH_OPTIONS=127.0.0.1
- POSTMASTER_ADDRESS={{ postmaster_email }}
dns:
- - {{ johan_ip }}
+ - {{ nameserver_ip }}
restart: always
diff --git a/roles/roundcube/templates/docker-compose.yml.j2 b/roles/roundcube/templates/docker-compose.yml.j2
index c185aa2..e29d400 100644
--- a/roles/roundcube/templates/docker-compose.yml.j2
+++ b/roles/roundcube/templates/docker-compose.yml.j2
@@ -12,7 +12,7 @@ services:
ports:
- 127.0.0.1:9002:80
dns:
- - {{ johan_ip }}
+ - {{ nameserver_ip }}
environment:
- ROUNDCUBEMAIL_DB_TYPE=sqlite
- ROUNDCUBEMAIL_SKIN=elastic
diff --git a/roles/vpn/templates/config.yml.j2 b/roles/vpn/templates/config.yml.j2
index 750a05f..64e00fb 100644
--- a/roles/vpn/templates/config.yml.j2
+++ b/roles/vpn/templates/config.yml.j2
@@ -177,7 +177,7 @@ dns_config:
# List of DNS servers to expose to clients.
nameservers:
- - {{ johan_ip }}
+ - {{ nameserver_ip }}
# NextDNS (see https://tailscale.com/kb/1218/nextdns/).
# "abc123" is example NextDNS ID, replace with yours.