From 10cc93c8cee9edc3885fce9c56dbedbffe0993a6 Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardo@eth0.com.br>
Date: Mon, 1 Jul 2024 16:37:44 -0300
Subject: [PATCH] - DNS redirect fix - Remove vim-nox from main container

---
 Dockerfile                     | 1 -
 firewall/tools.py              | 2 +-
 init.sh                        | 3 +++
 wireguard_webadmin/settings.py | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index db19248..135fe27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,6 @@ RUN apt-get update && apt-get install -y \
     inetutils-ping \
     inetutils-traceroute \
     nano \
-    vim-nox \
     openssl \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/firewall/tools.py b/firewall/tools.py
index 1c91e06..5423eb7 100644
--- a/firewall/tools.py
+++ b/firewall/tools.py
@@ -164,7 +164,7 @@ def generate_firewall_header():
 #
 # This script was generated by WireGuard_WebAdmin on {timezone.now().strftime('%Y-%m-%d %H:%M:%S %Z')}
 #
-DNS_IP=$(host wireguard-webadmin-dns | grep -oP 'has address \K[\d\.]+')
+DNS_IP=$(getent hosts wireguard-webadmin-dns | awk '{{ print $1 }}')
 if [ -z "$DNS_IP" ]; then
     DNS_IP="127.0.0.250"
 fi
diff --git a/init.sh b/init.sh
index eb5b359..6abb680 100644
--- a/init.sh
+++ b/init.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 set -e
 
+# Lets wait for the DNS container to start
+sleep 5
+
 # Starts each WireGuard configuration file found in /etc/wireguard
 shopt -s nullglob
 config_files=(/etc/wireguard/*.conf)
diff --git a/wireguard_webadmin/settings.py b/wireguard_webadmin/settings.py
index d547ac9..c6b0d69 100644
--- a/wireguard_webadmin/settings.py
+++ b/wireguard_webadmin/settings.py
@@ -134,6 +134,6 @@ STATICFILES_DIRS = [
 DNS_CONFIG_FILE = '/etc/dnsmasq/wireguard_webadmin_dns.conf'
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-WIREGUARD_WEBADMIN_VERSION = 9609
+WIREGUARD_WEBADMIN_VERSION = 9611
 
 from wireguard_webadmin.production_settings import *