Browse Source

Merge branch 'master' into v1

v1
Steven Foerster 5 years ago
parent
commit
b2d29d79c8
  1. 2
      base.yml
  2. 8
      scripts/subinstallers/wireguard.sh

2
base.yml

@ -158,7 +158,7 @@ services:
pihole: pihole:
container_name: mistborn_production_pihole container_name: mistborn_production_pihole
image: pihole/pihole:v5.3.4 image: pihole/pihole:v5.5.1
env_file: env_file:
- /opt/mistborn_volumes/base/base.txt - /opt/mistborn_volumes/base/base.txt
ports: ports:

8
scripts/subinstallers/wireguard.sh

@ -12,10 +12,10 @@ if ! $(sudo apt-cache show wireguard > /dev/null 2>&1) ; then
if [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then if [ "$DISTRO" == "raspbian" ] || [ "$DISTRO" == "raspios" ]; then
echo "Adding Wireguard repo keys" echo "Adding Wireguard repo keys"
sudo -E apt-get install -y dirmngr sudo -E apt-get install -y dirmngr
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8B48AD6246925553
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7638D0442B90D010
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 04EE7237B7D453EC
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 648ACFD622F3D138
fi fi
if [ "$DISTRO" == "ubuntu" ]; then if [ "$DISTRO" == "ubuntu" ]; then

Loading…
Cancel
Save