From 502ca0a5ade9b1fe42f559747c41d8a6677c053c Mon Sep 17 00:00:00 2001
From: Patrick Kishino <patrick.a.kishino@gmail.com>
Date: Wed, 29 Sep 2021 09:15:18 +0900
Subject: [PATCH] Fixed missing env variables (#1973)

* Update bug_report.yaml (#1949)

* Fixed missing env variables

openvpn tunnelUp was missing required env variables: fixed
privoxy start/stop same: fixed
PEER_DNS and PEER_DNS_PIN_ROUTES added to persistEnv file
---
 .github/ISSUE_TEMPLATE/bug_report.yaml | 12 ++++++++----
 openvpn/persistEnvironment.py          |  4 +++-
 openvpn/tunnelUp.sh                    |  3 +++
 privoxy/scripts/start.sh               |  1 -
 privoxy/scripts/stop.sh                |  2 ++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index d4456e107..73b83eba0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -7,15 +7,17 @@ body:
     label: Is there a pinned issue for this?
     description: Please read the pinned issues to see if they cover your issue first.
     options:
-    - label: I have read the pinned issues
+    - label: I have read the pinned issues and could not find my issue
       required: true
 - type: checkboxes
   attributes:
-    label: Is there an existing or similar issue for this?
+    label: Is there an existing or similar issue/discussion for this?
     description: Please search to see if an issue already exists for the bug you encountered.
     options:
     - label: I have searched the existing issues
       required: true
+    - label: I have searched the existing discussions
+      required: true
 - type: checkboxes
   attributes:
     label: Is there any comment in the documentation for this?
@@ -26,10 +28,12 @@ body:
 - type: checkboxes
   attributes:
     label: Is this related to a provider? 
-    description: Please check the  <a href="https://github.com/haugene/vpn-configs-contrib/issues/">provider issues repo</a> for this.
+    description: Please check the  <a href="https://github.com/haugene/vpn-configs-contrib/issues/">provider issues repo</a> for this. If this issue is related to a provider, please post it there.
     options:
     - label: I have checked the provider repo for issues
       required: true
+    - label: My issue is NOT related to a provider
+      required: true
 - type: checkboxes
   attributes:
     label: Are you using the latest release? 
@@ -82,7 +86,7 @@ body:
   attributes:
     label: Log output
     description: |
-      Please show log output, either text or screenshot
+      Please show complete log output, either text or screenshot
 
       Tip: You can attach images by clicking this area to highlight it and then dragging files in.
   validations:
diff --git a/openvpn/persistEnvironment.py b/openvpn/persistEnvironment.py
index 31cd2ac56..ce78b6ab7 100644
--- a/openvpn/persistEnvironment.py
+++ b/openvpn/persistEnvironment.py
@@ -21,7 +21,9 @@ wanted_variables = {
     'GLOBAL_APPLY_PERMISSIONS',
     'LOG_TO_STDOUT',
     'DISABLE_PORT_UPDATER',
-    'TZ'
+    'TZ',
+    'PEER_DNS',
+    'PEER_DNS_PIN_ROUTES'
 }
 
 variables_to_persist = {}
diff --git a/openvpn/tunnelUp.sh b/openvpn/tunnelUp.sh
index 18edea94b..a72346f7e 100755
--- a/openvpn/tunnelUp.sh
+++ b/openvpn/tunnelUp.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# Source our persisted env variables from container startup
+. /etc/transmission/environment-variables.sh
+
 if [[ "${PEER_DNS,,}" == "true" ]]; then
         NS=
         NS_ROUTES=( )
diff --git a/privoxy/scripts/start.sh b/privoxy/scripts/start.sh
index 18029cdcd..bf7036992 100755
--- a/privoxy/scripts/start.sh
+++ b/privoxy/scripts/start.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # Source our persisted env variables from container startup
-# shellcheck source=/dev/null
 . /etc/transmission/environment-variables.sh
 
 set_port()
diff --git a/privoxy/scripts/stop.sh b/privoxy/scripts/stop.sh
index 73d8f8d01..018db3674 100755
--- a/privoxy/scripts/stop.sh
+++ b/privoxy/scripts/stop.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Source our persisted env variables from container startup
+. /etc/transmission/environment-variables.sh
 
 if [[ "${WEBPROXY_ENABLED}" = "true" ]]; then