diff --git a/scripts/install.sh b/scripts/install.sh index 13dfdfa..bda8c28 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -167,10 +167,10 @@ sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/ sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/ root:root / $USER:$USER /" sudo find /etc/systemd/system/ -type f -name 'Mistborn*' | xargs sudo sed -i "s/DIFACE/$iface/" -if [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then - # remove systemd-resolved lines - sudo sed -i '/.*systemd-resolved/d' /etc/systemd/system/Mistborn-base.service -fi +#if [ "$DISTRO" == "debian" ] || [ "$DISTRO" == "raspbian" ]; then +# # remove systemd-resolved lines +# sudo sed -i '/.*systemd-resolved/d' /etc/systemd/system/Mistborn-base.service +#fi # setup local volumes for pihole sudo mkdir -p ../mistborn_volumes/ diff --git a/scripts/services/Mistborn-base.service b/scripts/services/Mistborn-base.service index f8ff21a..8f23fa1 100644 --- a/scripts/services/Mistborn-base.service +++ b/scripts/services/Mistborn-base.service @@ -12,7 +12,6 @@ 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=/bin/systemctl stop systemd-resolved 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 @@ -31,7 +30,6 @@ ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 80 -j MISTBO ExecStopPost=/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 5555 -j MISTBORN_LOG_DROP ExecStopPost=/sbin/iptables -D OUTPUT -o DIFACE -p udp --dport 53 -j MISTBORN_LOG_DROP ExecStopPost=/sbin/ip6tables -D OUTPUT -p udp --dport 53 -j MISTBORN_LOG_DROP -ExecStopPost=/bin/systemctl start systemd-resolved [Install] WantedBy=multi-user.target