renamed env vars to match scripts

deleted `default.conf` & `server.conf` files from pihole and moved env vars to '.env'

docker-compose.nginx.yaml

@@ -6,7 +6,7 @@ services:
  # nginx container
  nginx:
  container_name: nginx
- hostname: ${HOSTNAME}
+ hostname: ${HOST_NAME}
  image: nginx:v1.17
  volumes:
  - ./nginx-docker/configs/:/etc/nginx/

docker-compose.traefik.yaml

@@ -18,7 +18,7 @@ services:
  # nginx container
  nginx:
  container_name: nginx
- hostname: ${HOSTNAME}
+ hostname: ${HOST_NAME}
  image: nginx:1.17
  volumes:
  - ./nginx-docker/configs/:/etc/nginx/
@@ -50,10 +50,10 @@ services:
  # træfik container
  traefik:
  container_name: traefik
- hostname: ${HOSTNAME}
+ hostname: ${HOST_NAME}
  image: traefik:v2.0
  environment:
- - TZ=${TZ:-Europe/London}
+ - TZ=${TIMEZONE:-Europe/London}
  volumes:
  - /etc/localtime:/etc/localtime:ro
  - /var/run/docker.sock:/var/run/docker.sock

docker-compose.yaml

@@ -6,7 +6,7 @@ services:
  # DoH server container
  doh_server:
  container_name: doh_server
- hostname: ${HOSTNAME}
+ hostname: ${HOST_NAME}
  image: goofball222/dns-over-https:latest
  volumes:
  - ./doh-docker/configs/doh-server.conf:/opt/dns-over-https/conf/doh-server.conf
@@ -35,15 +35,15 @@ services:
  # pihole container
  pihole:
  container_name: pihole
- hostname: ${HOSTNAME}
+ hostname: ${HOST_NAME}
  depends_on:
  - unbound
  image: pihole/pihole:latest
- env_file:
- - ./pihole-docker/configs/default.conf
- - ./pihole-docker/configs/server.conf
  environment:
- - TZ=${TZ:-Europe/London}
+ - TZ=${TIMEZONE:-Europe/London}
+ - ServerIP=${HOST_IP}
+ - DNS1=172.16.1.5#53
+ - DNS2=no
  volumes:
  - ./pihole-docker/resolv.conf:/etc/resolv.conf
  - ./pihole-docker/configs/pihole/:/etc/pihole/
@@ -98,10 +98,10 @@ services:
  # unbound container
  unbound:
  container_name: unbound
- hostname: ${HOSTNAME}
- image: mvance/unbound-rpi:latest
+ hostname: ${HOST_NAME}
+ image: mvance/${UNBOUND_VARIANT:-unbound}:latest
  environment:
- - TZ=${TZ:-Europe/London}
+ - TZ=${TIMEZONE:-Europe/London}
  volumes:
  - ./unbound-docker/configs:/opt/unbound/etc/unbound/
  - ./unbound-docker/var:/opt/unbound/etc/unbound/var/