From 78ef870d919e99ca892fdd411c14cca18bf48bda Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 25 Nov 2021 15:33:06 +0100
Subject: [PATCH 1/3] Update wg-dashboard.service

A more automated approach
---
 src/wg-dashboard.service | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/wg-dashboard.service b/src/wg-dashboard.service
index 9a596df..44b5c43 100644
--- a/src/wg-dashboard.service
+++ b/src/wg-dashboard.service
@@ -1,11 +1,14 @@
 [Unit]
-After=netword.service
+After=syslog.target network-online.target
+ConditionPathIsDirectory=/etc/wireguard
 
 [Service]
-WorkingDirectory=<your dashboard directory full path here>
-ExecStart=/usr/bin/python3 <your dashboard directory full path here>dashboard.py
+Environment="VIRTUAL_ENV={{VIRTUAL_ENV}}"
+WorkingDirectory={{APP_ROOT}}
+ExecStart={{VIRTUAL_ENV}}/bin/python3 {{APP_ROOT}}dashboard.py
+PrivateTmp=yes
 Restart=always
 
 
 [Install]
-WantedBy=default.target
\ No newline at end of file
+WantedBy=multi-user.target

From 591b60c336e0ee1d2e4b71403a4506c032385cbc Mon Sep 17 00:00:00 2001
From: Markus Neubauer <neubauer@email-online.org>
Date: Thu, 25 Nov 2021 15:55:56 +0100
Subject: [PATCH 2/3] Update wgd.sh

a more automated approach to systemctl
---
 src/wgd.sh | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/wgd.sh b/src/wgd.sh
index 3676947..38814a1 100755
--- a/src/wgd.sh
+++ b/src/wgd.sh
@@ -20,6 +20,17 @@ help () {
   printf "=================================================================================\n"
 }
 
+_check_and_set_venv(){
+    # deb/ubuntu users: might need a 'apt install python3.8-venv'
+    # set up the local environment
+    APP_ROOT=`pwd`
+    VIRTUAL_ENV="${APP_ROOT%/*}/venv"
+    if [ ! -d $VIRTUAL_ENV ]; then
+        python3 -m venv $VIRTUAL_ENV
+    fi
+    . ${VIRTUAL_ENV}/activate
+}
+
 install_wgd(){
     # Check Python3 version
     version_pass=$(python3 -c 'import sys; print("1") if (sys.version_info.major == 3 and sys.version_info.minor >= 7) else print("0");')
@@ -33,9 +44,24 @@ install_wgd(){
       then mkdir "log"
     fi
     printf "| Installing latest Python dependencies                    |\n"
+    
+    # set up the local environment
+    _check_and_set_venv
+    
     python3 -m pip install -r requirements.txt >  /dev/null 2>&1
     printf "| WGDashboard installed successfully!              |\n"
-    printf "| Starting Dashboard                                       |\n"
+    
+    printf "| Preparing the systemctl unit file                        |\n"
+    sed -i "s#{{APP_ROOT}}#${APP_ROOT}#" wg-dashboard.service
+    sed -i "s#{{VIRTUAL_ENV}}#${VIRTUAL_ENV}#" wg-dashboard.service
+    cat wg-dashboard.service | sudo SYSTEMD_EDITOR=tee systemctl edit --force --full wg-dashboard.service
+    systemctl daemon-reload
+    printf "| Consider 'systemctl enable wg-dashboard'                 |\n"
+    printf "       and 'systemctl start wg-dashboard'\n"
+    printf "       use '${0} stop' before starting with systemctl\n"
+    echo
+    
+    printf "| Now starting Dashboard in background                     |\n"
     start_wgd
 }
 
@@ -50,6 +76,7 @@ check_wgd_status(){
 }
 
 start_wgd () {
+    _check_and_set_venv
     printf "%s\n" "$dashes"
     printf "| Starting WGDashboard in the background.          |\n"
     if [ ! -d "log" ]
@@ -67,6 +94,7 @@ stop_wgd() {
 
 start_wgd_debug() {
   printf "%s\n" "$dashes"
+  _check_and_set_venv
   printf "| Starting WGDashboard in the foreground.                  |\n"
   python3 "$app_name"
   printf "%s\n" "$dashes"
@@ -84,6 +112,7 @@ update_wgd() {
     git stash > /dev/null 2>&1
     git pull https://github.com/donaldzou/wireguard-dashboard.git $new_ver --force >  /dev/null 2>&1
     printf "| Installing latest Python dependencies                    |\n"
+    _check_and_set_venv
     python3 -m pip install -r requirements.txt >  /dev/null 2>&1
     printf "| Update Successfully!                                     |\n"
     start_wgd
@@ -142,4 +171,3 @@ if [ "$#" != 1 ];
         help
     fi
 fi
-

From fbce01d8463d204cd17e5aea18850e0e58d999ac Mon Sep 17 00:00:00 2001
From: Donald Cheng Hong Zou <donaldzou@live.hk>
Date: Sun, 19 Dec 2021 18:15:51 -0500
Subject: [PATCH 3/3] Update .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 076f2e7..0cfdd62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@ src/static/pic.xd
 *.conf
 private_key.txt
 public_key.txt
-venv/*
+venv/**
\ No newline at end of file