Merge pull request #3 from trjohnson19/fix-env

Use consistent env vars; use more env vars

Author: trjohnson19

.env.example

@@ -6,13 +6,13 @@ RENDER_GROUP=
 VIDEO_GROUP=
 TZ=
 USERDIR=  # Full path (i.e. `/home/<user>`, not `~`)
-DOCKERDIR=  # e.g. $USERDIR/docker
-APPDIR=  # e.g. $DOCKERDIR/appdata
-SECRETSDIR=  # e.g. $DOCKERDIR/secrets
-DATADIR=  # e.g. $DOCKERDIR/data or /mnt/nas/dockerdata
+DOCKERDIR=  # e.g. "${USERDIR}/docker"
+APPDIR=  # e.g. "${DOCKERDIR}/appdata"
+SECRETSDIR=  # e.g. "${DOCKERDIR}/secrets"
+DATADIR=  # e.g. "${DOCKERDIR}/data" or /mnt/nas/dockerdata
 COMPOSE_HTTP_TIMEOUT=  # Necessary for slow DNS lookups that are possible with Pi-Hole
 IP=  # Internal LAN server IP
-SERVER_IP=$IP
+SERVER_IP="${IP}"
 LAN_NETWORK=  # CIDR notation e.g. 192.168.1.0/24
 
 
@@ -55,11 +55,14 @@ BLUEBUBBLES_VNC_PORT=5999
 BLUEBUBBLES_SERVER_PORT=1234
 GLUETUN_HTTP_CONTROL_SERVER_PORT=9001
 GLUETUN_PRIVATE_HTTP_CONTROL_SERVER_PORT=9002
+TDARR_SERVER_PORT=8266
+TDARR_WEBUI_PORT=8265
+TDARR_NODE_PORT=9267
 
 
 ##### T2_PROXY NETWORK IPS
 
-## Example values given, can be whatever ports are desired
+## Example values given, can be whatever IPs are desired
 T2_PROXY_SUBNET=10.123.101.0/24
 T2_PROXY_GATEWAY=10.123.101.1
 TRAEFIK_IPV4=10.123.101.254
@@ -79,15 +82,15 @@ TAUTULLI_IPV4=10.123.101.111
 
 ##### SOCKET_PROXY NETWORK IPS
 
-## Example values given, can be whatever ports are desired
+## Example values given, can be whatever IPs are desired
 SOCKET_PROXY_SUBNET=10.123.102.0/24
 SOCKET_PROXY_GATEWAY=10.123.102.1
 SOCKET_PROXY_IPV4=10.123.102.254
 
 
 ##### GLUETUN_NET NETWORK IPS
 
-## Example values given, can be whatever ports are desired
+## Example values given, can be whatever IPs are desired
 GLUETUN_SUBNET=10.123.103.0/24
 GLUETUN_GATEWAY=10.123.103.1
 GLUETUN_IPV4=10.123.103.254
@@ -116,7 +119,7 @@ EMAIL_ADDRESS=
 EMAIL_SERVER=
 EMAIL_SERVER_PORT=
 EMAIL_SERVER_USER=
-EMAIL_SERVER_PASSWORD=
+# EMAIL_SERVER_PASSWORD=  # Use docker secrets instead
 EMAIL_SERVER_SECURITY=
 
 
@@ -184,3 +187,15 @@ BLUEBUBBLES_VNC_PASSWORD=
 GLUETUN_SERVER_COUNTRIES=
 GLUETUN_SERVER_CITIES=
 GLUETUN_SERVER_HOSTNAMES=
+
+
+##### NEW RELIC
+
+NRIA_LICENSE_KEY=
+
+
+##### MISCELLANEOUS
+
+NTP_SERVERS="pool.ntp.org,time.nist.gov,time.cloudflare.com"
+WIREGUARD_PEERS="misc1,misc2,misc3"
+