- DNS redirect fix

- Remove vim-nox from main container
This commit is contained in:
Eduardo Silva 2024-07-01 16:37:44 -03:00
parent 71920a212b
commit 10cc93c8ce
4 changed files with 5 additions and 3 deletions

View File

@ -11,7 +11,6 @@ RUN apt-get update && apt-get install -y \
inetutils-ping \ inetutils-ping \
inetutils-traceroute \ inetutils-traceroute \
nano \ nano \
vim-nox \
openssl \ openssl \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View File

@ -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')} # 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 if [ -z "$DNS_IP" ]; then
DNS_IP="127.0.0.250" DNS_IP="127.0.0.250"
fi fi

View File

@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
set -e set -e
# Lets wait for the DNS container to start
sleep 5
# Starts each WireGuard configuration file found in /etc/wireguard # Starts each WireGuard configuration file found in /etc/wireguard
shopt -s nullglob shopt -s nullglob
config_files=(/etc/wireguard/*.conf) config_files=(/etc/wireguard/*.conf)

View File

@ -134,6 +134,6 @@ STATICFILES_DIRS = [
DNS_CONFIG_FILE = '/etc/dnsmasq/wireguard_webadmin_dns.conf' DNS_CONFIG_FILE = '/etc/dnsmasq/wireguard_webadmin_dns.conf'
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
WIREGUARD_WEBADMIN_VERSION = 9609 WIREGUARD_WEBADMIN_VERSION = 9611
from wireguard_webadmin.production_settings import * from wireguard_webadmin.production_settings import *