From ce8e73e7b6756fce84d74d30435624f104901bc1 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Tue, 24 Mar 2020 14:37:32 -0400 Subject: [PATCH] secondary ip address to nic --- scripts/conf/02-lan.conf | 1 - scripts/install.sh | 3 +-- scripts/services/Mistborn-base.service | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 scripts/conf/02-lan.conf diff --git a/scripts/conf/02-lan.conf b/scripts/conf/02-lan.conf deleted file mode 100644 index b6fc208..0000000 --- a/scripts/conf/02-lan.conf +++ /dev/null @@ -1 +0,0 @@ -localise-queries diff --git a/scripts/install.sh b/scripts/install.sh index 042cec3..c8f54af 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -197,8 +197,7 @@ sudo systemctl disable dnsmasq 2>/dev/null || true sudo grep -qF "$(hostname)" /etc/hosts && echo "$(hostname) already in /etc/hosts" || echo "127.0.1.1 $(hostname) $(hostname)" | sudo tee -a /etc/hosts # resolve all *.mistborn domains -sudo cp ./scripts/conf/02-lan.conf ../mistborn_volumes/base/pihole/etc-dnsmasqd/ -echo "address=/.mistborn/$IPV4_PUBLIC" | sudo tee -a ../mistborn_volumes/base/pihole/etc-dnsmasqd/02-lan.conf +echo "address=/.mistborn/10.2.3.1" | sudo tee ../mistborn_volumes/base/pihole/etc-dnsmasqd/02-lan.conf # ResolvConf (OpenResolv installed with Wireguard) sudo sed -i "s/#name_servers.*/name_servers=$IPV4_PUBLIC/" /etc/resolvconf.conf diff --git a/scripts/services/Mistborn-base.service b/scripts/services/Mistborn-base.service index 8f23fa1..2647af9 100644 --- a/scripts/services/Mistborn-base.service +++ b/scripts/services/Mistborn-base.service @@ -12,6 +12,7 @@ PermissionsStartOnly=true ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/base.yml down ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/base.yml build +ExecStartPre=/sbin/ip address add 10.2.3.1/30 dev DIFACE || true ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p udp --dport 53 -j MISTBORN_LOG_DROP ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 53 -j MISTBORN_LOG_DROP ExecStartPre=/sbin/iptables -I DOCKER-USER -i DIFACE -p tcp --dport 80 -j MISTBORN_LOG_DROP