Browse Source

Merge branch '9-dnscrypt' into 'master'

DNScrypt for arm64 and armv7

Closes #9

See merge request cyber5k/mistborn!10
merge-requests/11/merge
Steven Foerster 6 years ago
parent
commit
ead109d1f4
  1. 2
      base.yml
  2. 3
      scripts/install.sh
  3. 2
      scripts/subinstallers/docker.sh

2
base.yml

@ -146,7 +146,7 @@ services:
dnscrypt-proxy: dnscrypt-proxy:
container_name: mistborn_production_dnscrypt_proxy container_name: mistborn_production_dnscrypt_proxy
image: djaydev/dnscrypt-proxy image: cyber5k/dnscrypt-proxy:latest
environment: environment:
- DNSCRYPT_LISTEN_PORT=5054 - DNSCRYPT_LISTEN_PORT=5054
# resolvers: https://download.dnscrypt.info/dnscrypt-resolvers/v2/public-resolvers.md # resolvers: https://download.dnscrypt.info/dnscrypt-resolvers/v2/public-resolvers.md

3
scripts/install.sh

@ -193,6 +193,9 @@ sudo systemctl disable systemd-resolved 2>/dev/null || true
sudo systemctl stop dnsmasq 2>/dev/null || true sudo systemctl stop dnsmasq 2>/dev/null || true
sudo systemctl disable dnsmasq 2>/dev/null || true sudo systemctl disable dnsmasq 2>/dev/null || true
# hostname in /etc/hosts
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 # resolve all *.mistborn domains
echo "address=/.mistborn/$IPV4_PUBLIC" | sudo tee ../mistborn_volumes/base/pihole/etc-dnsmasqd/02-lan.conf echo "address=/.mistborn/$IPV4_PUBLIC" | sudo tee ../mistborn_volumes/base/pihole/etc-dnsmasqd/02-lan.conf

2
scripts/subinstallers/docker.sh

@ -61,7 +61,7 @@ echo "Installing Docker Compose"
#elif [ "$DISTRO" == "raspbian" ]; then #elif [ "$DISTRO" == "raspbian" ]; then
# Install required packages # Install required packages
sudo apt update sudo apt update
sudo apt install -y python python3-pip libffi-dev python-backports.ssl-match-hostname sudo apt install -y python python3-pip libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
# Install Docker Compose from pip # Install Docker Compose from pip
# This might take a while # This might take a while

Loading…
Cancel
Save