From 257c314f350550d47f3ec2c4b10ce94cdf17bda2 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sat, 25 Apr 2020 17:15:03 -0400 Subject: [PATCH] vars script and file --- base.yml | 4 ++-- scripts/services/Mistborn-base.service | 2 ++ scripts/vars/base.sh | 12 ++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 scripts/vars/base.sh diff --git a/base.yml b/base.yml index a64bbfe..e16a544 100644 --- a/base.yml +++ b/base.yml @@ -130,8 +130,8 @@ services: container_name: mistborn_production_pihole image: pihole/pihole:latest ports: - - "10.2.3.1:53:53/tcp" - - "10.2.3.1:53:53/udp" + - "${MISTBORN_DNS_BIND_IP}:53:53/tcp" + - "${MISTBORN_DNS_BIND_IP}:53:53/udp" labels: - "traefik.enable=true" environment: diff --git a/scripts/services/Mistborn-base.service b/scripts/services/Mistborn-base.service index b1c52b5..d7c3f7e 100644 --- a/scripts/services/Mistborn-base.service +++ b/scripts/services/Mistborn-base.service @@ -9,6 +9,8 @@ User=root Group=docker PermissionsStartOnly=true # Shutdown container (if running) when unit is stopped +EnvironmentFile=/opt/mistborn_volumes/base/base.txt +ExecStartPre=/opt/mistborn/scripts/vars/base.sh ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/base.yml down ExecStartPre=/usr/local/bin/docker-compose -f /opt/mistborn/base.yml build diff --git a/scripts/vars/base.sh b/scripts/vars/base.sh new file mode 100644 index 0000000..2753fb7 --- /dev/null +++ b/scripts/vars/base.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +VAR_FILE=/opt/mistborn_volumes/base/base.txt + +source /opt/mistborn/scripts/subinstallers/platform.sh + +export MISTBORN_DNS_BIND_IP="0.0.0.0" +if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then + export MISTBORN_DNS_BIND_IP="10.2.3.1" +fi + +echo "MISTBORN_DNS_BIND_IP=${MISTBORN_DNS_BIND_IP}" | sudo tee ${VAR_FILE}