From 956496d8401a90a9d9e8f94be5c4860ff7b292f5 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 22 Oct 2023 14:29:26 +0300
Subject: [PATCH 01/17] Additional configuration env variables

WGUI_BRAND_TEXT - The brand text of the web application
WGUI_ACCENT_COLOR - The color of the interface sidebar
WGUI_LOGO_FILE_PATH - The file path of the website logo
WGUI_PAGE_TITLE_PREFIX - The HTML title prefix for all pages
---
 README.md            |   4 ++++
 custom/img/logo.png  | Bin 0 -> 7793 bytes
 handler/routes.go    |   9 +++++++++
 main.go              |  16 +++++++++++++++-
 templates/base.html  |   6 +++---
 templates/login.html |   6 +++---
 util/config.go       |   7 +++++++
 7 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 custom/img/logo.png

diff --git a/README.md b/README.md
index 0da4652..47be9cc 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,10 @@ docker-compose up
 | `WGUI_TABLE`                | The default WireGuard table value settings                                                                                                                   | `auto`                             |
 | `WGUI_CONFIG_FILE_PATH`     | The default WireGuard config file path used in global settings                                                                                               | `/etc/wireguard/wg0.conf`          |
 | `WGUI_LOG_LEVEL`            | The default log level. Possible values: `DEBUG`, `INFO`, `WARN`, `ERROR`, `OFF`                                                                              | `INFO`                             |
+| `WGUI_BRAND_TEXT`          | The brand text of the web application                                                                                                                        | `WireGuard UI`                     |
+| `WGUI_ACCENT_COLOR`        | The color of the interface sidebar                                                                                                                           | `#343a40`                          |
+| `WGUI_LOGO_FILE_PATH`      | The file path of the website logo                                                                                                                            | Embedded WireGuard logo            |
+| `WGUI_PAGE_TITLE_PREFIX`   | The HTML title prefix for all pages                                                                                                                          | N/A                                |
 | `WG_CONF_TEMPLATE`          | The custom `wg.conf` config file template. Please refer to our [default template](https://github.com/ngoduykhanh/wireguard-ui/blob/master/templates/wg.conf) | N/A                                |
 | `EMAIL_FROM_ADDRESS`        | The sender email address                                                                                                                                     | N/A                                |
 | `EMAIL_FROM_NAME`           | The sender name                                                                                                                                              | `WireGuard UI`                     |
diff --git a/custom/img/logo.png b/custom/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..54256334d651176dde616b8205df2df3199f1e01
GIT binary patch
literal 7793
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

literal 0
HcmV?d00001

diff --git a/handler/routes.go b/handler/routes.go
index a2ceeaf..b5b274a 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -42,6 +42,15 @@ func Favicon() echo.HandlerFunc {
 	}
 }
 
+func Logo() echo.HandlerFunc {
+	return func(c echo.Context) error {
+		if logo, ok := os.LookupEnv(util.LogoFilePathEnvVar); ok {
+			return c.File(logo)
+		}
+		return c.Redirect(http.StatusFound, util.BasePath+"/static/custom/img/logo.png")
+	}
+}
+
 // LoginPage handler
 func LoginPage() echo.HandlerFunc {
 	return func(c echo.Context) error {
diff --git a/main.go b/main.go
index 0131208..9d0977b 100644
--- a/main.go
+++ b/main.go
@@ -41,6 +41,9 @@ var (
 	flagSessionSecret  string = util.RandomString(32)
 	flagWgConfTemplate string
 	flagBasePath       string
+	flagBrandText       string = "WireGuard UI"
+	flagAccentColor     string = "#343a40"
+	flagPageTitlePrefix string
 )
 
 const (
@@ -80,6 +83,10 @@ func init() {
 	flag.StringVar(&flagSessionSecret, "session-secret", util.LookupEnvOrString("SESSION_SECRET", flagSessionSecret), "The key used to encrypt session cookies.")
 	flag.StringVar(&flagWgConfTemplate, "wg-conf-template", util.LookupEnvOrString("WG_CONF_TEMPLATE", flagWgConfTemplate), "Path to custom wg.conf template.")
 	flag.StringVar(&flagBasePath, "base-path", util.LookupEnvOrString("BASE_PATH", flagBasePath), "The base path of the URL")
+	flag.StringVar(&flagBrandText, "brand-text", util.LookupEnvOrString("WGUI_BRAND_TEXT", flagBrandText), "The UI brand text or name")
+	flag.StringVar(&flagAccentColor, "accent-color", util.LookupEnvOrString("WGUI_ACCENT_COLOR", flagAccentColor), "The UI accent color")
+	flag.StringVar(&flagPageTitlePrefix, "page-title-prefix", util.LookupEnvOrString("WGUI_PAGE_TITLE_PREFIX", flagPageTitlePrefix), "The prefix of the page title")
+
 	flag.Parse()
 
 	// update runtime config
@@ -98,7 +105,10 @@ func init() {
 	util.SessionSecret = []byte(flagSessionSecret)
 	util.WgConfTemplate = flagWgConfTemplate
 	util.BasePath = util.ParseBasePath(flagBasePath)
-
+	util.BrandText = flagBrandText
+	util.AccentColor = flagAccentColor
+	util.PageTitlePrefix = flagPageTitlePrefix
+	
 	// print only if log level is INFO or lower
 	if lvl, _ := util.ParseLogLevel(util.LookupEnvOrString(util.LogLevel, "INFO")); lvl <= log.INFO {
 		// print app information
@@ -133,6 +143,9 @@ func main() {
 	extraData["gitCommit"] = gitCommit
 	extraData["basePath"] = util.BasePath
 	extraData["loginDisabled"] = flagDisableLogin
+	extraData["brandText"] = flagBrandText;
+	extraData["accentColor"] = flagAccentColor;
+	extraData["pageTitlePrefix"] = flagPageTitlePrefix;
 
 	// strip the "templates/" prefix from the embedded directory so files can be read by their direct name (e.g.
 	// "base.html" instead of "templates/base.html")
@@ -170,6 +183,7 @@ func main() {
 	app.GET(util.BasePath+"/about", handler.AboutPage())
 	app.GET(util.BasePath+"/_health", handler.Health())
 	app.GET(util.BasePath+"/favicon", handler.Favicon())
+	app.GET(util.BasePath+"/logo", handler.Logo())
 	app.POST(util.BasePath+"/new-client", handler.NewClient(db), handler.ValidSession, handler.ContentTypeJson)
 	app.POST(util.BasePath+"/update-client", handler.UpdateClient(db), handler.ValidSession, handler.ContentTypeJson)
 	app.POST(util.BasePath+"/email-client", handler.EmailClient(db, sendmail, defaultEmailSubject, defaultEmailContent), handler.ValidSession, handler.ContentTypeJson)
diff --git a/templates/base.html b/templates/base.html
index 0865ff3..88bb49d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,7 +5,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>{{template "title" .}}</title>
+    <title>{{.pageTitlePrefix}}{{template "title" .}}</title>
     <!-- Tell the browser to be responsive to screen width -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- Favicon -->
@@ -84,10 +84,10 @@
         <!-- /.navbar -->
 
         <!-- Main Sidebar Container -->
-        <aside class="main-sidebar sidebar-dark-primary elevation-4">
+        <aside class="main-sidebar sidebar-dark-primary elevation-4" style="background-color: {{.accentColor}};">
             <!-- Brand Logo -->
             <a href="{{.basePath}}" class="brand-link">
-                <span class="brand-text">&nbsp; WIREGUARD UI</span>
+                <span class="brand-text">&nbsp; {{.brandText}}</span>
             </a>
 
             <!-- Sidebar -->
diff --git a/templates/login.html b/templates/login.html
index c0a96b9..ee4fa11 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>WireGuard UI</title>
+    <title>{{.brandText}}</title>
     <!-- Tell the browser to be responsive to screen width -->
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!-- Favicon -->
@@ -24,8 +24,8 @@
 
 <body class="hold-transition login-page">
     <div class="login-box">
-        <div class="login-logo">
-            <a href="https://github.com/ngoduykhanh/wireguard-ui">WireGuard UI</a>
+        <div class="login-logo pb-3">
+            <img class="img-fluid" src="{{.basePath}}/logo">
         </div>
         <!-- /.login-logo -->
         <div class="card">
diff --git a/util/config.go b/util/config.go
index 3c3bd18..500c5f3 100644
--- a/util/config.go
+++ b/util/config.go
@@ -19,6 +19,9 @@ var (
 	SessionSecret  []byte
 	WgConfTemplate string
 	BasePath       string
+	BrandText string
+	AccentColor string
+	PageTitlePrefix string
 )
 
 const (
@@ -53,6 +56,10 @@ const (
 	DefaultClientExtraAllowedIpsEnvVar     = "WGUI_DEFAULT_CLIENT_EXTRA_ALLOWED_IPS"
 	DefaultClientUseServerDNSEnvVar        = "WGUI_DEFAULT_CLIENT_USE_SERVER_DNS"
 	DefaultClientEnableAfterCreationEnvVar = "WGUI_DEFAULT_CLIENT_ENABLE_AFTER_CREATION"
+	BrandTextEnvVar                        = "WGUI_BRAND_TEXT"
+	AccentColorEnvVar                      = "WGUI_ACCENT_COLOR"
+	PageTitlePrefixEnvVar                  = "WGUI_PAGE_TITLE_PREFIX"
+	LogoFilePathEnvVar                     = "WGUI_LOGO_FILE_PATH"
 )
 
 func ParseBasePath(basePath string) string {

From db872c426167b378031e914d5406a7b95a66a014 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 22 Oct 2023 15:36:14 +0300
Subject: [PATCH 02/17] Show only connected peers of relevant device in status
 page

---
 handler/routes.go     | 65 ++++++++++++++++++++++++++-----------------
 templates/status.html |  1 -
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/handler/routes.go b/handler/routes.go
index b5b274a..b57da03 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"crypto/subtle"
+	"path/filepath"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
@@ -805,6 +806,16 @@ func GlobalSettings(db store.IStore) echo.HandlerFunc {
 	}
 }
 
+func extractDeviceNameFromConfigPath(db store.IStore) string {
+	settings, err := db.GetGlobalSettings()
+	if err != nil {
+		log.Error("Cannot get global settings: ", err)
+	}
+
+    base := filepath.Base(settings.ConfigFilePath)
+    return strings.TrimSuffix(base, filepath.Ext(base))
+}
+
 // Status handler
 func Status(db store.IStore) echo.HandlerFunc {
 	type PeerVM struct {
@@ -835,6 +846,8 @@ func Status(db store.IStore) echo.HandlerFunc {
 			})
 		}
 
+		deviceName := extractDeviceNameFromConfigPath(db)
+
 		devices, err := wgClient.Devices()
 		if err != nil {
 			return c.Render(http.StatusInternalServerError, "status.html", map[string]interface{}{
@@ -863,35 +876,37 @@ func Status(db store.IStore) echo.HandlerFunc {
 
 			conv := map[bool]int{true: 1, false: 0}
 			for i := range devices {
-				devVm := DeviceVM{Name: devices[i].Name}
-				for j := range devices[i].Peers {
-					var allocatedIPs string
-					for _, ip := range devices[i].Peers[j].AllowedIPs {
-						if len(allocatedIPs) > 0 {
-							allocatedIPs += "</br>"
+				if devices[i].Name == deviceName {
+					devVm := DeviceVM{Name: devices[i].Name}
+					for j := range devices[i].Peers {
+						var allocatedIPs string
+						for _, ip := range devices[i].Peers[j].AllowedIPs {
+							if len(allocatedIPs) > 0 {
+								allocatedIPs += "</br>"
+							}
+							allocatedIPs += ip.String()
 						}
-						allocatedIPs += ip.String()
-					}
-					pVm := PeerVM{
-						PublicKey:         devices[i].Peers[j].PublicKey.String(),
-						ReceivedBytes:     devices[i].Peers[j].ReceiveBytes,
-						TransmitBytes:     devices[i].Peers[j].TransmitBytes,
-						LastHandshakeTime: devices[i].Peers[j].LastHandshakeTime,
-						LastHandshakeRel:  time.Since(devices[i].Peers[j].LastHandshakeTime),
-						AllocatedIP:       allocatedIPs,
-						Endpoint:          devices[i].Peers[j].Endpoint.String(),
-					}
-					pVm.Connected = pVm.LastHandshakeRel.Minutes() < 3.
+						pVm := PeerVM{
+							PublicKey:         devices[i].Peers[j].PublicKey.String(),
+							ReceivedBytes:     devices[i].Peers[j].ReceiveBytes,
+							TransmitBytes:     devices[i].Peers[j].TransmitBytes,
+							LastHandshakeTime: devices[i].Peers[j].LastHandshakeTime,
+							LastHandshakeRel:  time.Since(devices[i].Peers[j].LastHandshakeTime),
+							AllocatedIP:       allocatedIPs,
+							Endpoint:          devices[i].Peers[j].Endpoint.String(),
+						}
+						pVm.Connected = pVm.LastHandshakeRel.Minutes() < 3.
 
-					if _client, ok := m[pVm.PublicKey]; ok {
-						pVm.Name = _client.Name
-						pVm.Email = _client.Email
+						if _client, ok := m[pVm.PublicKey]; ok {
+							pVm.Name = _client.Name
+							pVm.Email = _client.Email
+						}
+						devVm.Peers = append(devVm.Peers, pVm)
 					}
-					devVm.Peers = append(devVm.Peers, pVm)
+					sort.SliceStable(devVm.Peers, func(i, j int) bool { return devVm.Peers[i].Name < devVm.Peers[j].Name })
+					sort.SliceStable(devVm.Peers, func(i, j int) bool { return conv[devVm.Peers[i].Connected] > conv[devVm.Peers[j].Connected] })
+					devicesVm = append(devicesVm, devVm)
 				}
-				sort.SliceStable(devVm.Peers, func(i, j int) bool { return devVm.Peers[i].Name < devVm.Peers[j].Name })
-				sort.SliceStable(devVm.Peers, func(i, j int) bool { return conv[devVm.Peers[i].Connected] > conv[devVm.Peers[j].Connected] })
-				devicesVm = append(devicesVm, devVm)
 			}
 		}
 
diff --git a/templates/status.html b/templates/status.html
index a9b770b..d7c568c 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -35,7 +35,6 @@ Connected Peers
         {{ end}}
         {{ range $dev := .devices }}
             <table class="table table-sm">
-                <caption>List of connected peers for device with name {{ $dev.Name }} </caption>
               <thead>
                 <tr>
                   <th scope="col">#</th>

From 0d562ffec58e2ee829bc32174b350d1481d9277b Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 22 Oct 2023 15:37:57 +0300
Subject: [PATCH 03/17] Rename 'WireGuard Clients' page to 'Clients'

---
 templates/base.html    | 2 +-
 templates/clients.html | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 88bb49d..a5c2f18 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -120,7 +120,7 @@
                             <a href="{{.basePath}}/" class="nav-link {{if eq .baseData.Active ""}}active{{end}}">
                                 <i class="nav-icon fas fa-user-secret"></i>
                                 <p>
-                                    Wireguard Clients
+                                    Clients
                                 </p>
                             </a>
                         </li>
diff --git a/templates/clients.html b/templates/clients.html
index bcd5855..6624305 100644
--- a/templates/clients.html
+++ b/templates/clients.html
@@ -1,5 +1,5 @@
 {{define "title"}}
-Wireguard Clients
+Clients
 {{end}}
 
 {{define "top_css"}}
@@ -17,13 +17,13 @@ Wireguard Clients
 {{end}}
 
 {{define "page_title"}}
-Wireguard Clients
+Clients
 {{end}}
 
 {{define "page_content"}}
 <section class="content">
     <div class="container-fluid">
-        <!-- <h5 class="mt-4 mb-2">Wireguard Clients</h5> -->
+        <!-- <h5 class="mt-4 mb-2">Clients</h5> -->
         <div class="row" id="client-list">
         </div>
         <!-- /.row -->

From 364d9b9c9aa79e6be86118305ef0c12bf8d338f5 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 22 Oct 2023 15:44:46 +0300
Subject: [PATCH 04/17] Hide about page from sidebar for non-admins

---
 templates/base.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/templates/base.html b/templates/base.html
index a5c2f18..6e53df3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -174,6 +174,8 @@
                                 </p>
                             </a>
                         </li>
+
+                        {{if .baseData.Admin}}
                         <li class="nav-header">ABOUT</li>
                         <li class="nav-item">
                             <a href="{{.basePath}}/about" class="nav-link {{if eq .baseData.Active "about" }}active{{end}}">
@@ -183,6 +185,7 @@
                             </p>
                             </a>
                         </li>
+                        {{end}}
                     </ul>
                 </nav>
                 <!-- /.sidebar-menu -->

From 0bf6dae5cf9deb574bd9373e27cb93cad5e57ae9 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 15:49:29 +0200
Subject: [PATCH 05/17] Correct mimetype for client configuration file
 downloads

---
 handler/routes.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/handler/routes.go b/handler/routes.go
index b57da03..6b430ff 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -699,7 +699,7 @@ func DownloadClient(db store.IStore) echo.HandlerFunc {
 
 		// set response header for downloading
 		c.Response().Header().Set(echo.HeaderContentDisposition, fmt.Sprintf("attachment; filename=%s.conf", clientData.Client.Name))
-		return c.Stream(http.StatusOK, "text/plain", reader)
+		return c.Stream(http.StatusOK, "text/conf", reader)
 	}
 }
 

From ca42b4aeab84ab0a33658daec2be0dc5371741b2 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 15:56:56 +0200
Subject: [PATCH 06/17] Add endpoint field to client

---
 handler/routes.go      |  1 +
 model/client.go        |  1 +
 templates/base.html    |  7 ++++++-
 templates/clients.html | 11 ++++++++++-
 templates/wg.conf      |  7 ++++---
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/handler/routes.go b/handler/routes.go
index 6b430ff..232f32b 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -624,6 +624,7 @@ func UpdateClient(db store.IStore) echo.HandlerFunc {
 		client.AllocatedIPs = _client.AllocatedIPs
 		client.AllowedIPs = _client.AllowedIPs
 		client.ExtraAllowedIPs = _client.ExtraAllowedIPs
+		client.Endpoint = _client.Endpoint
 		client.PublicKey = _client.PublicKey
 		client.PresharedKey = _client.PresharedKey
 		client.UpdatedAt = time.Now().UTC()
diff --git a/model/client.go b/model/client.go
index be5fa76..95342f0 100644
--- a/model/client.go
+++ b/model/client.go
@@ -15,6 +15,7 @@ type Client struct {
 	AllocatedIPs    []string  `json:"allocated_ips"`
 	AllowedIPs      []string  `json:"allowed_ips"`
 	ExtraAllowedIPs []string  `json:"extra_allowed_ips"`
+	Endpoint        string    `json:"endpoint"`
 	UseServerDNS    bool      `json:"use_server_dns"`
 	Enabled         bool      `json:"enabled"`
 	CreatedAt       time.Time `json:"created_at"`
diff --git a/templates/base.html b/templates/base.html
index 6e53df3..0412c46 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -235,6 +235,10 @@
                                 </label>
                                 <input type="text" data-role="tagsinput" class="form-control" id="client_extra_allowed_ips" value="{{ StringsJoin .client_defaults.ExtraAllowedIps "," }}">
                             </div>
+                            <div class="form-group">
+                                <label for="client_endpoint" class="control-label">Endpoint</label>
+                                <input type="text" class="form-control" id="client_endpoint" name="client_endpoint">
+                            </div>
                             <div class="form-group">
                                 <div class="icheck-primary d-inline">
                                     <input type="checkbox" id="use_server_dns" {{ if .client_defaults.UseServerDNS }}checked{{ end }}>
@@ -416,6 +420,7 @@
             const email = $("#client_email").val();
             const allocated_ips = $("#client_allocated_ips").val().split(",");
             const allowed_ips = $("#client_allowed_ips").val().split(",");
+            const endpoint = $("#client_endpoint").val();
             let use_server_dns = false;
             let extra_allowed_ips = [];
 
@@ -437,7 +442,7 @@
             const preshared_key = $("#client_preshared_key").val();
 
             const data = {"name": name, "email": email, "allocated_ips": allocated_ips, "allowed_ips": allowed_ips,
-                "extra_allowed_ips": extra_allowed_ips, "use_server_dns": use_server_dns, "enabled": enabled,
+                "extra_allowed_ips": extra_allowed_ips, "endpoint": endpoint, "use_server_dns": use_server_dns, "enabled": enabled,
                 "public_key": public_key, "preshared_key": preshared_key};
 
             $.ajax({
diff --git a/templates/clients.html b/templates/clients.html
index 6624305..1d5cd8e 100644
--- a/templates/clients.html
+++ b/templates/clients.html
@@ -113,6 +113,10 @@ Clients
                         <input type="text" data-role="tagsinput" class="form-control"
                                id="_client_extra_allowed_ips">
                     </div>
+                    <div class="form-group">
+                        <label for="_client_endpoint" class="control-label">Endpoint</label>
+                        <input type="text" class="form-control" id="_client_endpoint" name="client_endpoint">
+                    </div>
                     <div class="form-group">
                         <div class="icheck-primary d-inline">
                             <input type="checkbox" id="_use_server_dns">
@@ -477,6 +481,8 @@ Clients
                             modal.find("#_client_extra_allowed_ips").addTag(obj);
                         });
 
+                        modal.find("#_client_endpoint").val(client.endpoint);
+
                         modal.find("#_use_server_dns").prop("checked", client.use_server_dns);
                         modal.find("#_enabled").prop("checked", client.enabled);
 
@@ -564,6 +570,8 @@ Clients
                 extra_allowed_ips = $("#_client_extra_allowed_ips").val().split(",");
             }
 
+            const endpoint = $("#_client_endpoint").val();
+
             if ($("#_use_server_dns").is(':checked')){
                 use_server_dns = true;
             }
@@ -575,7 +583,8 @@ Clients
             }
 
             const data = {"id": client_id, "name": name, "email": email, "allocated_ips": allocated_ips,
-                "allowed_ips": allowed_ips, "extra_allowed_ips": extra_allowed_ips, "use_server_dns": use_server_dns, "enabled": enabled, "public_key": public_key, "preshared_key": preshared_key};
+                "allowed_ips": allowed_ips, "extra_allowed_ips": extra_allowed_ips, "endpoint": endpoint,
+                "use_server_dns": use_server_dns, "enabled": enabled, "public_key": public_key, "preshared_key": preshared_key};
 
             $.ajax({
                 cache: false,
diff --git a/templates/wg.conf b/templates/wg.conf
index 81893a8..258cefa 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -20,6 +20,7 @@ Table = {{ .globalSettings.Table }}
 # Update at:    {{ .Client.UpdatedAt }}
 [Peer]
 PublicKey = {{ .Client.PublicKey }}
-{{if .Client.PresharedKey }}PresharedKey = {{ .Client.PresharedKey }}
-{{end}}AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}{{range .Client.ExtraAllowedIPs }},{{.}}{{end}}
-{{end}}{{end}}
+{{if .Client.PresharedKey }}PresharedKey = {{ .Client.PresharedKey }}{{end}}
+AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}{{range .Client.ExtraAllowedIPs }},{{.}}{{end}}{{end}}
+{{if .Client.Endpoint }}Endpoint = {{ .Client.Endpoint }}{{end}}
+{{end}}
\ No newline at end of file

From 08024e2ad72992e228633e8d8ad01520c75e4732 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:08:48 +0200
Subject: [PATCH 07/17] Implement HELLO_HOSTNAME runtime configuration variable

---
 README.md       | 1 +
 emailer/smtp.go | 6 ++++--
 main.go         | 5 ++++-
 util/config.go  | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 47be9cc..161ca74 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ docker-compose up
 | `SMTP_PASSWORD`             | The SMTP user password                                                                                                                                       | N/A                                |
 | `SMTP_AUTH_TYPE`            | The SMTP authentication type. Possible values: `PLAIN`, `LOGIN`, `NONE`                                                                                      | `NONE`                             |
 | `SMTP_ENCRYPTION`           | the encryption method. Possible values: `NONE`, `SSL`, `SSLTLS`, `TLS`, `STARTTLS`                                                                           | `STARTTLS`                         |
+| `HELLO_HOSTNAME`            | Hostname to use for the hello message. smtp-relay.gmail.com needs this set to anything but `localhost`                                                       | `localhost`                        |
 
 ### Defaults for server configuration
 
diff --git a/emailer/smtp.go b/emailer/smtp.go
index f77db7c..7bc22fe 100644
--- a/emailer/smtp.go
+++ b/emailer/smtp.go
@@ -13,6 +13,7 @@ type SmtpMail struct {
 	port       int
 	username   string
 	password   string
+	helloHostName string
 	authType   mail.AuthType
 	encryption mail.Encryption
 	noTLSCheck bool
@@ -46,8 +47,8 @@ func encryptionType(encryptionType string) mail.Encryption {
 	}
 }
 
-func NewSmtpMail(hostname string, port int, username string, password string, noTLSCheck bool, auth string, fromName, from string, encryption string) *SmtpMail {
-	ans := SmtpMail{hostname: hostname, port: port, username: username, password: password, noTLSCheck: noTLSCheck, fromName: fromName, from: from, authType: authType(auth), encryption: encryptionType(encryption)}
+func NewSmtpMail(hostname string, port int, username string, password string, helloHostName string, noTLSCheck bool, auth string, fromName, from string, encryption string) *SmtpMail {
+	ans := SmtpMail{hostname: hostname, port: port, username: username, password: password, helloHostName: helloHostName, noTLSCheck: noTLSCheck, fromName: fromName, from: from, authType: authType(auth), encryption: encryptionType(encryption)}
 	return &ans
 }
 
@@ -66,6 +67,7 @@ func (o *SmtpMail) Send(toName string, to string, subject string, content string
 	server.Authentication = o.authType
 	server.Username = o.username
 	server.Password = o.password
+	server.Helo = o.helloHostName
 	server.Encryption = o.encryption
 	server.KeepAlive = false
 	server.ConnectTimeout = 10 * time.Second
diff --git a/main.go b/main.go
index 9d0977b..0d65f9b 100644
--- a/main.go
+++ b/main.go
@@ -30,6 +30,7 @@ var (
 	flagBindAddress    string = "0.0.0.0:5000"
 	flagSmtpHostname   string = "127.0.0.1"
 	flagSmtpPort       int    = 25
+	flagHelloHostName  string = "localhost"
 	flagSmtpUsername   string
 	flagSmtpPassword   string
 	flagSmtpAuthType   string = "NONE"
@@ -72,6 +73,7 @@ func init() {
 	flag.StringVar(&flagBindAddress, "bind-address", util.LookupEnvOrString("BIND_ADDRESS", flagBindAddress), "Address:Port to which the app will be bound.")
 	flag.StringVar(&flagSmtpHostname, "smtp-hostname", util.LookupEnvOrString("SMTP_HOSTNAME", flagSmtpHostname), "SMTP Hostname")
 	flag.IntVar(&flagSmtpPort, "smtp-port", util.LookupEnvOrInt("SMTP_PORT", flagSmtpPort), "SMTP Port")
+	flag.StringVar(&flagHelloHostName, "hello-hostname", util.LookupEnvOrString("HELLO_HOSTNAME", flagHelloHostName), "Hello HostName")
 	flag.StringVar(&flagSmtpUsername, "smtp-username", util.LookupEnvOrString("SMTP_USERNAME", flagSmtpUsername), "SMTP Username")
 	flag.StringVar(&flagSmtpPassword, "smtp-password", util.LookupEnvOrString("SMTP_PASSWORD", flagSmtpPassword), "SMTP Password")
 	flag.BoolVar(&flagSmtpNoTLSCheck, "smtp-no-tls-check", util.LookupEnvOrBool("SMTP_NO_TLS_CHECK", flagSmtpNoTLSCheck), "Disable TLS verification for SMTP. This is potentially dangerous.")
@@ -94,6 +96,7 @@ func init() {
 	util.BindAddress = flagBindAddress
 	util.SmtpHostname = flagSmtpHostname
 	util.SmtpPort = flagSmtpPort
+	util.HelloHostName = flagHelloHostName
 	util.SmtpUsername = flagSmtpUsername
 	util.SmtpPassword = flagSmtpPassword
 	util.SmtpAuthType = flagSmtpAuthType
@@ -176,7 +179,7 @@ func main() {
 	if util.SendgridApiKey != "" {
 		sendmail = emailer.NewSendgridApiMail(util.SendgridApiKey, util.EmailFromName, util.EmailFrom)
 	} else {
-		sendmail = emailer.NewSmtpMail(util.SmtpHostname, util.SmtpPort, util.SmtpUsername, util.SmtpPassword, util.SmtpNoTLSCheck, util.SmtpAuthType, util.EmailFromName, util.EmailFrom, util.SmtpEncryption)
+		sendmail = emailer.NewSmtpMail(util.SmtpHostname, util.SmtpPort, util.SmtpUsername, util.SmtpPassword, util.HelloHostName, util.SmtpNoTLSCheck, util.SmtpAuthType, util.EmailFromName, util.EmailFrom, util.SmtpEncryption)
 	}
 
 	app.GET(util.BasePath+"/test-hash", handler.GetHashesChanges(db), handler.ValidSession)
diff --git a/util/config.go b/util/config.go
index 500c5f3..052f2f5 100644
--- a/util/config.go
+++ b/util/config.go
@@ -10,6 +10,7 @@ var (
 	SmtpPort       int
 	SmtpUsername   string
 	SmtpPassword   string
+	HelloHostName  string
 	SmtpNoTLSCheck bool
 	SmtpEncryption string
 	SmtpAuthType   string

From 2c604297241cd6c3338dbf7d7f297bb4b78b1ff6 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:10:45 +0200
Subject: [PATCH 08/17] Make interface PostUp & PostDown settings optional in
 wg.conf

---
 templates/wg.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/wg.conf b/templates/wg.conf
index 258cefa..1b71f7f 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -8,8 +8,8 @@ Address = {{$first :=true}}{{range .serverConfig.Interface.Addresses }}{{if $fir
 ListenPort = {{ .serverConfig.Interface.ListenPort }}
 PrivateKey = {{ .serverConfig.KeyPair.PrivateKey }}
 {{if .globalSettings.MTU}}MTU = {{ .globalSettings.MTU }}{{end}}
-PostUp = {{ .serverConfig.Interface.PostUp }}
-PostDown = {{ .serverConfig.Interface.PostDown }}
+{{if .serverConfig.Interface.PostUp }}PostUp = {{ .serverConfig.Interface.PostUp }}{{end}}
+{{if .serverConfig.Interface.PostDown }}PostDown = {{ .serverConfig.Interface.PostDown }}{{end}}
 Table = {{ .globalSettings.Table }}
 
 {{range .clientDataList}}{{if eq .Client.Enabled true}}

From 0de0edafb82211ba40835675a2482d8a485e4a43 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:17:40 +0200
Subject: [PATCH 09/17] Handle os.chmod errors

---
 store/jsondb/jsondb.go             | 57 +++++++++++++++++++++++-------
 store/jsondb/jsondb_wake_on_lan.go |  8 +++--
 util/util.go                       | 10 ++++--
 3 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/store/jsondb/jsondb.go b/store/jsondb/jsondb.go
index 0b674b0..f1e3b1e 100644
--- a/store/jsondb/jsondb.go
+++ b/store/jsondb/jsondb.go
@@ -68,7 +68,10 @@ func (o *JsonDB) Init() error {
 		serverInterface.PostDown = util.LookupEnvOrString(util.ServerPostDownScriptEnvVar, "")
 		serverInterface.UpdatedAt = time.Now().UTC()
 		o.conn.Write("server", "interfaces", serverInterface)
-		os.Chmod(serverInterfacePath, 0600)
+		err := util.ManagePerms(serverInterfacePath)
+		if err != nil {
+			return err
+		}
 	}
 
 	// server's key pair
@@ -83,7 +86,10 @@ func (o *JsonDB) Init() error {
 		serverKeyPair.PublicKey = key.PublicKey().String()
 		serverKeyPair.UpdatedAt = time.Now().UTC()
 		o.conn.Write("server", "keypair", serverKeyPair)
-		os.Chmod(serverKeyPairPath, 0600)
+		err = util.ManagePerms(serverKeyPairPath)
+		if err != nil {
+			return err
+		}
 	}
 
 	// global settings
@@ -108,7 +114,10 @@ func (o *JsonDB) Init() error {
 		globalSetting.ConfigFilePath = util.LookupEnvOrString(util.ConfigFilePathEnvVar, util.DefaultConfigFilePath)
 		globalSetting.UpdatedAt = time.Now().UTC()
 		o.conn.Write("server", "global_settings", globalSetting)
-		os.Chmod(globalSettingPath, 0600)
+		err := util.ManagePerms(globalSettingPath)
+		if err != nil {
+			return err
+		}
 	}
 
 	// hashes
@@ -117,7 +126,10 @@ func (o *JsonDB) Init() error {
 		clientServerHashes.Client = "none"
 		clientServerHashes.Server = "none"
 		o.conn.Write("server", "hashes", clientServerHashes)
-		os.Chmod(hashesPath, 0600)
+		err := util.ManagePerms(hashesPath)
+		if err != nil {
+			return err
+		}
 	}
 
 	// user info
@@ -136,7 +148,10 @@ func (o *JsonDB) Init() error {
 			user.PasswordHash = hash
 		}
 		o.conn.Write("users", user.Username, user)
-		os.Chmod(path.Join(path.Join(o.dbPath, "users"), user.Username+".json"), 0600)
+		err = util.ManagePerms(path.Join(path.Join(o.dbPath, "users"), user.Username+".json"))
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -182,7 +197,10 @@ func (o *JsonDB) GetUserByName(username string) (model.User, error) {
 func (o *JsonDB) SaveUser(user model.User) error {
 	userPath := path.Join(path.Join(o.dbPath, "users"), user.Username+".json")
 	output := o.conn.Write("users", user.Username, user)
-	os.Chmod(userPath, 0600)
+	err := util.ManagePerms(userPath)
+	if err != nil {
+		return err
+	}
 	return output
 }
 
@@ -295,7 +313,10 @@ func (o *JsonDB) GetClientByID(clientID string, qrCodeSettings model.QRCodeSetti
 func (o *JsonDB) SaveClient(client model.Client) error {
 	clientPath := path.Join(path.Join(o.dbPath, "clients"), client.ID+".json")
 	output := o.conn.Write("clients", client.ID, client)
-	os.Chmod(clientPath, 0600)
+	err := util.ManagePerms(clientPath)
+	if err != nil {
+		return err
+	}
 	return output
 }
 
@@ -306,21 +327,30 @@ func (o *JsonDB) DeleteClient(clientID string) error {
 func (o *JsonDB) SaveServerInterface(serverInterface model.ServerInterface) error {
 	serverInterfacePath := path.Join(path.Join(o.dbPath, "server"), "interfaces.json")
 	output := o.conn.Write("server", "interfaces", serverInterface)
-	os.Chmod(serverInterfacePath, 0600)
+	err := util.ManagePerms(serverInterfacePath)
+	if err != nil {
+		return err
+	}
 	return output
 }
 
 func (o *JsonDB) SaveServerKeyPair(serverKeyPair model.ServerKeypair) error {
 	serverKeyPairPath := path.Join(path.Join(o.dbPath, "server"), "keypair.json")
 	output := o.conn.Write("server", "keypair", serverKeyPair)
-	os.Chmod(serverKeyPairPath, 0600)
+	err := util.ManagePerms(serverKeyPairPath)
+	if err != nil {
+		return err
+	}
 	return output
 }
 
 func (o *JsonDB) SaveGlobalSettings(globalSettings model.GlobalSetting) error {
 	globalSettingsPath := path.Join(path.Join(o.dbPath, "server"), "global_settings.json")
 	output := o.conn.Write("server", "global_settings", globalSettings)
-	os.Chmod(globalSettingsPath, 0600)
+	err := util.ManagePerms(globalSettingsPath)
+	if err != nil {
+		return err
+	}
 	return output
 }
 
@@ -336,6 +366,9 @@ func (o *JsonDB) GetHashes() (model.ClientServerHashes, error) {
 func (o *JsonDB) SaveHashes(hashes model.ClientServerHashes) error {
 	hashesPath := path.Join(path.Join(o.dbPath, "server"), "hashes.json")
 	output := o.conn.Write("server", "hashes", hashes)
-	os.Chmod(hashesPath, 0600)
+	err := util.ManagePerms(hashesPath)
+	if err != nil {
+		return err
+	}
 	return output
-}
+}
\ No newline at end of file
diff --git a/store/jsondb/jsondb_wake_on_lan.go b/store/jsondb/jsondb_wake_on_lan.go
index a0ee935..661ba05 100644
--- a/store/jsondb/jsondb_wake_on_lan.go
+++ b/store/jsondb/jsondb_wake_on_lan.go
@@ -3,10 +3,10 @@ package jsondb
 import (
 	"encoding/json"
 	"fmt"
-	"os"
 	"path"
 
 	"github.com/ngoduykhanh/wireguard-ui/model"
+	"github.com/ngoduykhanh/wireguard-ui/util"
 )
 
 func (o *JsonDB) GetWakeOnLanHosts() ([]model.WakeOnLanHost, error) {
@@ -70,7 +70,11 @@ func (o *JsonDB) SaveWakeOnLanHost(host model.WakeOnLanHost) error {
 
 	wakeOnLanHostPath := path.Join(path.Join(o.dbPath, model.WakeOnLanHostCollectionName), resourceName+".json")
 	output := o.conn.Write(model.WakeOnLanHostCollectionName, resourceName, host)
-	os.Chmod(wakeOnLanHostPath, 0600)
+	err = util.ManagePerms(wakeOnLanHostPath)
+	if err != nil {
+		return err
+	}
+
 	return output
 
 }
diff --git a/util/util.go b/util/util.go
index 44f8f01..e93981c 100644
--- a/util/util.go
+++ b/util/util.go
@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/ngoduykhanh/wireguard-ui/store"
-	"golang.org/x/mod/sumdb/dirhash"
 	"io"
 	"io/fs"
 	"io/ioutil"
@@ -19,6 +17,9 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/ngoduykhanh/wireguard-ui/store"
+	"golang.org/x/mod/sumdb/dirhash"
+
 	externalip "github.com/glendc/go-external-ip"
 	"github.com/labstack/gommon/log"
 	"github.com/ngoduykhanh/wireguard-ui/model"
@@ -540,3 +541,8 @@ func RandomString(length int) string {
 	}
 	return string(b)
 }
+
+func ManagePerms(path string) error {
+	err := os.Chmod(path, 0600)
+	return err
+}
\ No newline at end of file

From d72b83f3c0db3dd1a8d4f4ece2c58ff48287e109 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:21:01 +0200
Subject: [PATCH 10/17] Include FwMark option when applying config

---
 templates/wg.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/wg.conf b/templates/wg.conf
index 1b71f7f..b333217 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -7,6 +7,7 @@
 Address = {{$first :=true}}{{range .serverConfig.Interface.Addresses }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}
 ListenPort = {{ .serverConfig.Interface.ListenPort }}
 PrivateKey = {{ .serverConfig.KeyPair.PrivateKey }}
+{{if .globalSettings.FirewallMark }}FwMark = {{ .globalSettings.FirewallMark }}{{end}}
 {{if .globalSettings.MTU}}MTU = {{ .globalSettings.MTU }}{{end}}
 {{if .serverConfig.Interface.PostUp }}PostUp = {{ .serverConfig.Interface.PostUp }}{{end}}
 {{if .serverConfig.Interface.PostDown }}PostDown = {{ .serverConfig.Interface.PostDown }}{{end}}

From ffb8df8de401448628aa4b0355f68fd19626c13e Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:22:45 +0200
Subject: [PATCH 11/17] Make interface Table setting optional in wg.conf

---
 templates/wg.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/wg.conf b/templates/wg.conf
index b333217..585b0c4 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -11,7 +11,7 @@ PrivateKey = {{ .serverConfig.KeyPair.PrivateKey }}
 {{if .globalSettings.MTU}}MTU = {{ .globalSettings.MTU }}{{end}}
 {{if .serverConfig.Interface.PostUp }}PostUp = {{ .serverConfig.Interface.PostUp }}{{end}}
 {{if .serverConfig.Interface.PostDown }}PostDown = {{ .serverConfig.Interface.PostDown }}{{end}}
-Table = {{ .globalSettings.Table }}
+{{if .globalSettings.Table}}Table = {{ .globalSettings.Table }}{{end}}
 
 {{range .clientDataList}}{{if eq .Client.Enabled true}}
 # ID:           {{ .Client.ID }}

From 08c627583708fec9ebedac586696a827c6d2d591 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:26:20 +0200
Subject: [PATCH 12/17] Add global PersistentKeepalive setting to wg.conf

---
 templates/wg.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/wg.conf b/templates/wg.conf
index 585b0c4..9614da7 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -23,5 +23,6 @@ PrivateKey = {{ .serverConfig.KeyPair.PrivateKey }}
 PublicKey = {{ .Client.PublicKey }}
 {{if .Client.PresharedKey }}PresharedKey = {{ .Client.PresharedKey }}{{end}}
 AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}{{range .Client.ExtraAllowedIPs }},{{.}}{{end}}{{end}}
+{{if .globalSettings.PersistentKeepalive}}PersistentKeepalive = {{ .globalSettings.PersistentKeepalive }}{{end}}
 {{if .Client.Endpoint }}Endpoint = {{ .Client.Endpoint }}{{end}}
 {{end}}
\ No newline at end of file

From 8aa8837eb660b680e8b8e74a11fd9b3380ec5a03 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:28:48 +0200
Subject: [PATCH 13/17] Expanded post-script boxes to textareas

---
 templates/server.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/server.html b/templates/server.html
index 366d301..dd41ba6 100644
--- a/templates/server.html
+++ b/templates/server.html
@@ -39,13 +39,13 @@ Wireguard Server Settings
                             </div>
                             <div class="form-group">
                                 <label for="post_up">Post Up Script</label>
-                                <input type="text" class="form-control" id="post_up" name="post_up"
-                                       placeholder="Post Up Script" value="{{ .serverInterface.PostUp }}">
+                                <textarea class="form-control" id="post_up" name="post_up"
+                                       placeholder="Post Up Script">{{ .serverInterface.PostUp }}</textarea>
                             </div>
                             <div class="form-group">
                                 <label for="post_down">Post Down Script</label>
-                                <input type="text" class="form-control" id="post_down" name="post_down"
-                                       placeholder="Post Down Script" value="{{ .serverInterface.PostDown }}">
+                                <textarea class="form-control" id="post_down" name="post_down"
+                                       placeholder="Post Down Script">{{ .serverInterface.PostDown }}</textarea>
                             </div>
                         </div>
                         <!-- /.card-body -->

From 0380988ffd71ffb570cd44ae3fcdb7ccc755b956 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 16:51:20 +0200
Subject: [PATCH 14/17] Better default email constants

---
 main.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 0d65f9b..aa6995e 100644
--- a/main.go
+++ b/main.go
@@ -48,11 +48,12 @@ var (
 )
 
 const (
-	defaultEmailSubject = "Your wireguard configuration"
-	defaultEmailContent = `Hi,</br>
-<p>In this email you can find your personal configuration for our wireguard server.</p>
+	defaultEmailSubject = "Your VPN configuration"
 
-<p>Best</p>
+	defaultEmailContent = `
+<p>Greetings,</p>
+<p>Please find attached your personal configuration for our VPN server.<br>You may find instructions on how to install the WireGuard VPN client <a href="https://www.wireguard.com/install/">here</a>.</p>
+<p>Best regards.</p>
 `
 )
 

From 74a7dc00d8a22638d1181c96e168dfbcc7433851 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Sun, 29 Oct 2023 17:04:44 +0200
Subject: [PATCH 15/17] Update references to GitHub repository

---
 README.md            | 6 +++---
 main.go              | 2 +-
 templates/about.html | 8 ++++----
 templates/base.html  | 2 +-
 templates/wg.conf    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 161ca74..23cbcbd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![](https://github.com/ngoduykhanh/wireguard-ui/workflows/wireguard-ui%20build%20release/badge.svg)
+![](https://github.com/idressos/wireguard-ui/workflows/wireguard-ui%20build%20release/badge.svg)
 
 # wireguard-ui
 
@@ -57,7 +57,7 @@ docker-compose up
 | `WGUI_ACCENT_COLOR`        | The color of the interface sidebar                                                                                                                           | `#343a40`                          |
 | `WGUI_LOGO_FILE_PATH`      | The file path of the website logo                                                                                                                            | Embedded WireGuard logo            |
 | `WGUI_PAGE_TITLE_PREFIX`   | The HTML title prefix for all pages                                                                                                                          | N/A                                |
-| `WG_CONF_TEMPLATE`          | The custom `wg.conf` config file template. Please refer to our [default template](https://github.com/ngoduykhanh/wireguard-ui/blob/master/templates/wg.conf) | N/A                                |
+| `WG_CONF_TEMPLATE`          | The custom `wg.conf` config file template. Please refer to our [default template](https://github.com/idressos/wireguard-ui/blob/master/templates/wg.conf) | N/A                                |
 | `EMAIL_FROM_ADDRESS`        | The sender email address                                                                                                                                     | N/A                                |
 | `EMAIL_FROM_NAME`           | The sender name                                                                                                                                              | `WireGuard UI`                     |
 | `SENDGRID_API_KEY`          | The SendGrid api key                                                                                                                                         | N/A                                |
@@ -229,7 +229,7 @@ go build -o wireguard-ui
 
 ## License
 
-MIT. See [LICENSE](https://github.com/ngoduykhanh/wireguard-ui/blob/master/LICENSE).
+MIT. See [LICENSE](https://github.com/idressos/wireguard-ui/blob/master/LICENSE).
 
 ## Support
 
diff --git a/main.go b/main.go
index aa6995e..dc725bd 100644
--- a/main.go
+++ b/main.go
@@ -121,7 +121,7 @@ func init() {
 		fmt.Println("Git Commit\t:", gitCommit)
 		fmt.Println("Git Ref\t\t:", gitRef)
 		fmt.Println("Build Time\t:", buildTime)
-		fmt.Println("Git Repo\t:", "https://github.com/ngoduykhanh/wireguard-ui")
+		fmt.Println("Git Repo\t:", "https://github.com/idressos/wireguard-ui")
 		fmt.Println("Authentication\t:", !util.DisableLogin)
 		fmt.Println("Bind address\t:", util.BindAddress)
 		//fmt.Println("Sendgrid key\t:", util.SendgridApiKey)
diff --git a/templates/about.html b/templates/about.html
index edbeb47..46339cc 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -63,7 +63,7 @@ About
                         </div>
                         <strong>Copyright &copy;
                             <script>document.write(new Date().getFullYear())</script>
-                            <a href="https://github.com/ngoduykhanh/wireguard-ui">Wireguard UI</a>.
+                            <a href="https://github.com/idressos/wireguard-ui">Wireguard UI</a>.
                         </strong> All rights reserved.
 
                     </div>
@@ -83,7 +83,7 @@ About
         $.ajax({
             cache: false,
             method: 'GET',
-            url: 'https://api.github.com/repos/ngoduykhanh/wireguard-ui/releases/tags/' + $("#version").val(),
+            url: 'https://api.github.com/repos/idressos/wireguard-ui/releases/tags/' + $("#version").val(),
             dataType: 'json',
             contentType: "application/json",
             success: function (data) {
@@ -99,7 +99,7 @@ About
         $.ajax({
             cache: false,
             method: 'GET',
-            url: 'https://api.github.com/repos/ngoduykhanh/wireguard-ui/releases/latest',
+            url: 'https://api.github.com/repos/idressos/wireguard-ui/releases/latest',
             dataType: 'json',
             contentType: "application/json",
             success: function (data) {
@@ -121,7 +121,7 @@ About
         $.ajax({
             cache: false,
             method: 'GET',
-            url: 'https://api.github.com/repos/ngoduykhanh/wireguard-ui/contributors',
+            url: 'https://api.github.com/repos/idressos/wireguard-ui/contributors',
             dataType: 'json',
             contentType: "application/json",
             success: function (data) {
diff --git a/templates/base.html b/templates/base.html
index 0412c46..b0a26fd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -335,7 +335,7 @@
             <div class="float-right d-none d-sm-block">
                 <b>Version</b> {{ .appVersion }}
             </div>
-            <strong>Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/ngoduykhanh/wireguard-ui">Wireguard UI</a>.</strong> All rights
+            <strong>Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/idressos/wireguard-ui">Wireguard UI</a>.</strong> All rights
             reserved.
         </footer>
         -->
diff --git a/templates/wg.conf b/templates/wg.conf
index 9614da7..c69b309 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -1,4 +1,4 @@
-# This file was generated using wireguard-ui (https://github.com/ngoduykhanh/wireguard-ui)
+# This file was generated using wireguard-ui (https://github.com/idressos/wireguard-ui)
 # Please don't modify it manually, otherwise your change might get replaced.
 
 # Address updated at:     {{ .serverConfig.Interface.UpdatedAt }}

From 9f093d97b1a05b543096db54cc490de299f00829 Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Mon, 30 Oct 2023 19:39:30 +0200
Subject: [PATCH 16/17] Capitalize 'g' in Wireguard

---
 README.md                         |  6 ++---
 examples/docker-compose/README.md |  8 +++----
 handler/routes.go                 | 38 +++++++++++++++----------------
 main.go                           |  2 +-
 package.json                      |  2 +-
 templates/about.html              |  4 ++--
 templates/base.html               |  6 ++---
 templates/global_settings.html    | 12 +++++-----
 templates/server.html             | 16 ++++++-------
 util/util.go                      |  2 +-
 10 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/README.md b/README.md
index 23cbcbd..eafa86b 100644
--- a/README.md
+++ b/README.md
@@ -186,9 +186,9 @@ rc-update add wgui default
 
 ### Using Docker
 
-Set `WGUI_MANAGE_RESTART=true` to manage Wireguard interface restarts.
-Using `WGUI_MANAGE_START=true` can also replace the function of `wg-quick@wg0` service, to start Wireguard at boot, by
-running the container with `restart: unless-stopped`. These settings can also pick up changes to Wireguard Config File
+Set `WGUI_MANAGE_RESTART=true` to manage WireGuard interface restarts.
+Using `WGUI_MANAGE_START=true` can also replace the function of `wg-quick@wg0` service, to start WireGuard at boot, by
+running the container with `restart: unless-stopped`. These settings can also pick up changes to WireGuard Config File
 Path, after restarting the container. Please make sure you have `--cap-add=NET_ADMIN` in your container config to make
 this
 feature work.
diff --git a/examples/docker-compose/README.md b/examples/docker-compose/README.md
index 951df08..4b645a3 100644
--- a/examples/docker-compose/README.md
+++ b/examples/docker-compose/README.md
@@ -2,7 +2,7 @@
 
 ### Kernel Module
 
-Depending on if the Wireguard kernel module is available on your system you have more or less choices which example to use.
+Depending on if the WireGuard kernel module is available on your system you have more or less choices which example to use.
 
 You can check if the kernel modules are available via the following command:
 ```shell
@@ -21,10 +21,10 @@ For security reasons it's highly recommended to change them before the first sta
 ## Examples
 - **[system](system.yml)**
 
-  If you have Wireguard already installed on your system and only want to run the UI in docker this might fit the most.
+  If you have WireGuard already installed on your system and only want to run the UI in docker this might fit the most.
 - **[linuxserver](linuxserver.yml)**
 
-  If you have the Wireguard kernel modules installed (included in the mainline kernel since version 5.6) but want it running inside of docker, this might fit the most.
+  If you have the WireGuard kernel modules installed (included in the mainline kernel since version 5.6) but want it running inside of docker, this might fit the most.
 - **[boringtun](boringtun.yml)**
 
-  If Wireguard kernel modules are not available, you can switch to an userspace implementation like [boringtun](https://github.com/cloudflare/boringtun).
+  If WireGuard kernel modules are not available, you can switch to an userspace implementation like [boringtun](https://github.com/cloudflare/boringtun).
diff --git a/handler/routes.go b/handler/routes.go
index 232f32b..53cd8d7 100644
--- a/handler/routes.go
+++ b/handler/routes.go
@@ -347,7 +347,7 @@ func WireGuardClients(db store.IStore) echo.HandlerFunc {
 	}
 }
 
-// GetClients handler return a JSON list of Wireguard client data
+// GetClients handler return a JSON list of WireGuard client data
 func GetClients(db store.IStore) echo.HandlerFunc {
 	return func(c echo.Context) error {
 
@@ -362,7 +362,7 @@ func GetClients(db store.IStore) echo.HandlerFunc {
 	}
 }
 
-// GetClient handler returns a JSON object of Wireguard client data
+// GetClient handler returns a JSON object of WireGuard client data
 func GetClient(db store.IStore) echo.HandlerFunc {
 	return func(c echo.Context) error {
 
@@ -419,12 +419,12 @@ func NewClient(db store.IStore) echo.HandlerFunc {
 		guid := xid.New()
 		client.ID = guid.String()
 
-		// gen Wireguard key pair
+		// gen WireGuard key pair
 		if client.PublicKey == "" {
 			key, err := wgtypes.GeneratePrivateKey()
 			if err != nil {
 				log.Error("Cannot generate wireguard key pair: ", err)
-				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate Wireguard key pair"})
+				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate WireGuard key pair"})
 			}
 			client.PrivateKey = key.String()
 			client.PublicKey = key.PublicKey().String()
@@ -432,7 +432,7 @@ func NewClient(db store.IStore) echo.HandlerFunc {
 			_, err := wgtypes.ParseKey(client.PublicKey)
 			if err != nil {
 				log.Error("Cannot verify wireguard public key: ", err)
-				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify Wireguard public key"})
+				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify WireGuard public key"})
 			}
 			// check for duplicates
 			clients, err := db.GetClients(false)
@@ -454,7 +454,7 @@ func NewClient(db store.IStore) echo.HandlerFunc {
 			if err != nil {
 				log.Error("Cannot generated preshared key: ", err)
 				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{
-					false, "Cannot generate Wireguard preshared key",
+					false, "Cannot generate WireGuard preshared key",
 				})
 			}
 			client.PresharedKey = presharedKey.String()
@@ -465,7 +465,7 @@ func NewClient(db store.IStore) echo.HandlerFunc {
 			_, err := wgtypes.ParseKey(client.PresharedKey)
 			if err != nil {
 				log.Error("Cannot verify wireguard preshared key: ", err)
-				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify Wireguard preshared key"})
+				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify WireGuard preshared key"})
 			}
 		}
 		client.CreatedAt = time.Now().UTC()
@@ -577,12 +577,12 @@ func UpdateClient(db store.IStore) echo.HandlerFunc {
 			return c.JSON(http.StatusBadRequest, jsonHTTPResponse{false, "Extra Allowed IPs must be in CIDR format"})
 		}
 
-		// update Wireguard Client PublicKey
+		// update WireGuard Client PublicKey
 		if client.PublicKey != _client.PublicKey && _client.PublicKey != "" {
 			_, err := wgtypes.ParseKey(_client.PublicKey)
 			if err != nil {
-				log.Error("Cannot verify provided Wireguard public key: ", err)
-				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify provided Wireguard public key"})
+				log.Error("Cannot verify provided WireGuard public key: ", err)
+				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify provided WireGuard public key"})
 			}
 			// check for duplicates
 			clients, err := db.GetClients(false)
@@ -597,7 +597,7 @@ func UpdateClient(db store.IStore) echo.HandlerFunc {
 				}
 			}
 
-			// When replacing any PublicKey, discard any locally stored Wireguard Client PrivateKey
+			// When replacing any PublicKey, discard any locally stored WireGuard Client PrivateKey
 			// Client PubKey no longer corresponds to locally stored PrivKey.
 			// QR code (needs PrivateKey) for this client is no longer possible now.
 
@@ -607,12 +607,12 @@ func UpdateClient(db store.IStore) echo.HandlerFunc {
 
 		}
 
-		// update Wireguard Client PresharedKey
+		// update WireGuard Client PresharedKey
 		if client.PresharedKey != _client.PresharedKey && _client.PresharedKey != "" {
 			_, err := wgtypes.ParseKey(_client.PresharedKey)
 			if err != nil {
-				log.Error("Cannot verify provided Wireguard preshared key: ", err)
-				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify provided Wireguard preshared key"})
+				log.Error("Cannot verify provided WireGuard preshared key: ", err)
+				return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot verify provided WireGuard preshared key"})
 			}
 		}
 
@@ -770,11 +770,11 @@ func WireGuardServerInterfaces(db store.IStore) echo.HandlerFunc {
 func WireGuardServerKeyPair(db store.IStore) echo.HandlerFunc {
 	return func(c echo.Context) error {
 
-		// gen Wireguard key pair
+		// gen WireGuard key pair
 		key, err := wgtypes.GeneratePrivateKey()
 		if err != nil {
 			log.Error("Cannot generate wireguard key pair: ", err)
-			return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate Wireguard key pair"})
+			return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate WireGuard key pair"})
 		}
 
 		var serverKeyPair model.ServerKeypair
@@ -783,7 +783,7 @@ func WireGuardServerKeyPair(db store.IStore) echo.HandlerFunc {
 		serverKeyPair.UpdatedAt = time.Now().UTC()
 
 		if err := db.SaveServerKeyPair(serverKeyPair); err != nil {
-			return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate Wireguard key pair"})
+			return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate WireGuard key pair"})
 		}
 		log.Infof("Updated wireguard server interfaces settings: %v", serverKeyPair)
 
@@ -936,7 +936,7 @@ func GlobalSettingSubmit(db store.IStore) echo.HandlerFunc {
 
 		// write config to the database
 		if err := db.SaveGlobalSettings(globalSettings); err != nil {
-			return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate Wireguard key pair"})
+			return c.JSON(http.StatusInternalServerError, jsonHTTPResponse{false, "Cannot generate WireGuard key pair"})
 		}
 
 		log.Infof("Updated global settings: %v", globalSettings)
@@ -1010,7 +1010,7 @@ func SuggestIPAllocation(db store.IStore) echo.HandlerFunc {
 	}
 }
 
-// ApplyServerConfig handler to write config file and restart Wireguard server
+// ApplyServerConfig handler to write config file and restart WireGuard server
 func ApplyServerConfig(db store.IStore, tmplDir fs.FS) echo.HandlerFunc {
 	return func(c echo.Context) error {
 
diff --git a/main.go b/main.go
index dc725bd..a94bb84 100644
--- a/main.go
+++ b/main.go
@@ -116,7 +116,7 @@ func init() {
 	// print only if log level is INFO or lower
 	if lvl, _ := util.ParseLogLevel(util.LookupEnvOrString(util.LogLevel, "INFO")); lvl <= log.INFO {
 		// print app information
-		fmt.Println("Wireguard UI")
+		fmt.Println("WireGuard UI")
 		fmt.Println("App Version\t:", appVersion)
 		fmt.Println("Git Commit\t:", gitCommit)
 		fmt.Println("Git Ref\t\t:", gitRef)
diff --git a/package.json b/package.json
index a0cda64..4644748 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wireguard-ui",
   "version": "1.0.0",
-  "description": "Wireguard web interface",
+  "description": "WireGuard web interface",
   "main": "index.js",
   "repository": "git@github.com:ngoduykhanh/wireguard-ui.git",
   "author": "Khanh Ngo <k@ndk.name>",
diff --git a/templates/about.html b/templates/about.html
index 46339cc..226d6d6 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -22,7 +22,7 @@ About
             <div class="col-md-6">
                 <div class="card card-success">
                     <div class="card-header">
-                        <h3 class="card-title">About Wireguard-UI</h3>
+                        <h3 class="card-title">About WireGuard-UI</h3>
                     </div>
                     <!-- /.card-header -->
                     <div class="card-body">
@@ -63,7 +63,7 @@ About
                         </div>
                         <strong>Copyright &copy;
                             <script>document.write(new Date().getFullYear())</script>
-                            <a href="https://github.com/idressos/wireguard-ui">Wireguard UI</a>.
+                            <a href="https://github.com/idressos/wireguard-ui">WireGuard UI</a>.
                         </strong> All rights reserved.
 
                     </div>
diff --git a/templates/base.html b/templates/base.html
index b0a26fd..8308fdd 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -130,7 +130,7 @@
                             <a href="{{.basePath}}/wg-server" class="nav-link {{if eq .baseData.Active "wg-server" }}active{{end}}">
                                 <i class="nav-icon fas fa-server"></i>
                                 <p>
-                                    Wireguard Server
+                                    WireGuard Server
                                 </p>
                             </a>
                         </li>
@@ -197,7 +197,7 @@
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h4 class="modal-title">New Wireguard Client</h4>
+                        <h4 class="modal-title">New WireGuard Client</h4>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
@@ -335,7 +335,7 @@
             <div class="float-right d-none d-sm-block">
                 <b>Version</b> {{ .appVersion }}
             </div>
-            <strong>Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/idressos/wireguard-ui">Wireguard UI</a>.</strong> All rights
+            <strong>Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/idressos/wireguard-ui">WireGuard UI</a>.</strong> All rights
             reserved.
         </footer>
         -->
diff --git a/templates/global_settings.html b/templates/global_settings.html
index cafb630..73ae639 100644
--- a/templates/global_settings.html
+++ b/templates/global_settings.html
@@ -22,7 +22,7 @@ Global Settings
             <div class="col-md-6">
                 <div class="card card-success">
                     <div class="card-header">
-                        <h3 class="card-title">Wireguard Global Settings</h3>
+                        <h3 class="card-title">WireGuard Global Settings</h3>
                     </div>
                     <!-- /.card-header -->
                     <!-- form start -->
@@ -68,7 +68,7 @@ Global Settings
                                     value="{{ .globalSettings.Table }}">
                             </div>
                             <div class="form-group">
-                                <label for="config_file_path">Wireguard Config File Path</label>
+                                <label for="config_file_path">WireGuard Config File Path</label>
                                 <input type="text" class="form-control" id="config_file_path"
                                     name="config_file_path" placeholder="E.g. /etc/wireguard/wg0.conf"
                                     value="{{ .globalSettings.ConfigFilePath }}">
@@ -92,7 +92,7 @@ Global Settings
                     <div class="card-body">
                         <dl>
                             <dt>1. Endpoint Address</dt>
-                            <dd>The public IP address of your Wireguard server that the client will connect to. Click on
+                            <dd>The public IP address of your WireGuard server that the client will connect to. Click on
                                 <strong>Suggest</strong> button to auto detect the public IP address of your server.</dd>
                             <dt>2. DNS Servers</dt>
                             <dd>The DNS servers will be set to client config.</dd>
@@ -110,8 +110,8 @@ Global Settings
                             <dd>Add a matching <code>fwmark</code> on all packets going out of a WireGuard non-default-route tunnel. Default value: <code>0xca6c</code></dd>
                             <dt>6. Table</dt>
                             <dd>Value for the <code>Table</code> setting in the wg conf file. Default value: <code>auto</code></dd>                            
-                            <dt>7. Wireguard Config File Path</dt>
-                            <dd>The path of your Wireguard server config file. Please make sure the parent directory
+                            <dt>7. WireGuard Config File Path</dt>
+                            <dd>The path of your WireGuard server config file. Please make sure the parent directory
                                 exists and is writable.</dd>
                         </dl>
                     </div>
@@ -195,7 +195,7 @@ Global Settings
         }
     </script>
     <script>
-        // Wireguard Interface DNS server tag input
+        // WireGuard Interface DNS server tag input
         $("#dns_servers").tagsInput({
             'width': '100%',
             'height': '75%',
diff --git a/templates/server.html b/templates/server.html
index dd41ba6..08cbc88 100644
--- a/templates/server.html
+++ b/templates/server.html
@@ -1,5 +1,5 @@
 {{define "title"}}
-Wireguard Server
+WireGuard Server
 {{end}}
 
 {{define "top_css"}}
@@ -10,13 +10,13 @@ Wireguard Server
 {{end}}
 
 {{define "page_title"}}
-Wireguard Server Settings
+WireGuard Server Settings
 {{end}}
 
 {{define "page_content"}}
 <section class="content">
     <div class="container-fluid">
-        <!-- <h5 class="mt-4 mb-2">Wireguard Server</h5> -->
+        <!-- <h5 class="mt-4 mb-2">WireGuard Server</h5> -->
         <div class="row">
             <!-- left column -->
             <div class="col-md-6">
@@ -109,7 +109,7 @@ Wireguard Server Settings
                 </button>
             </div>
             <div class="modal-body">
-                <p>Are you sure to generate a new key pair for the Wireguard server?<br/>
+                <p>Are you sure to generate a new key pair for the WireGuard server?<br/>
                 The existing Client's peer public key need to be updated to keep the connection working.</p>
             </div>
             <div class="modal-footer justify-content-between">
@@ -142,7 +142,7 @@ Wireguard Server Settings
                 data: JSON.stringify(data),
                 success: function(data) {
                     $("#modal_new_client").modal('hide');
-                    toastr.success('Updated Wireguard server interface addresses successfully');
+                    toastr.success('Updated WireGuard server interface addresses successfully');
                 },
                 error: function(jqXHR, exception) {
                     const responseJson = jQuery.parseJSON(jqXHR.responseText);
@@ -152,7 +152,7 @@ Wireguard Server Settings
         }
     </script>
     <script>
-        // Wireguard Interface Addresses tag input
+        // WireGuard Interface Addresses tag input
         $("#addresses").tagsInput({
             'width': '100%',
             // 'height': '75%',
@@ -169,7 +169,7 @@ Wireguard Server Settings
         $("#addresses").addTag('{{.}}');
         {{end}}
 
-        // Wireguard Interface Addresses form validation
+        // WireGuard Interface Addresses form validation
         $(document).ready(function () {
             $.validator.setDefaults({
                 submitHandler: function () {
@@ -205,7 +205,7 @@ Wireguard Server Settings
             });
         });
 
-        // Wireguard Key Pair generation confirmation button
+        // WireGuard Key Pair generation confirmation button
         $(document).ready(function () {
             $("#btn_generate_confirm").click(function () {
                 $.ajax({
diff --git a/util/util.go b/util/util.go
index e93981c..81b8869 100644
--- a/util/util.go
+++ b/util/util.go
@@ -383,7 +383,7 @@ func ValidateIPAllocation(serverAddresses []string, ipAllocatedList []string, ip
 	return true, nil
 }
 
-// WriteWireGuardServerConfig to write Wireguard server config. e.g. wg0.conf
+// WriteWireGuardServerConfig to write WireGuard server config. e.g. wg0.conf
 func WriteWireGuardServerConfig(tmplDir fs.FS, serverConfig model.Server, clientDataList []model.ClientData, usersList []model.User, globalSettings model.GlobalSetting) error {
 	var tmplWireguardConf string
 

From 24aa2a6cec38730ccd6b1149bbf8355f33a1ab8a Mon Sep 17 00:00:00 2001
From: Ioannis Dressos <96877388+idressos@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:40:20 +0200
Subject: [PATCH 17/17] Fix for commit #08c6275

---
 templates/wg.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/wg.conf b/templates/wg.conf
index c69b309..40e979b 100644
--- a/templates/wg.conf
+++ b/templates/wg.conf
@@ -23,6 +23,6 @@ PrivateKey = {{ .serverConfig.KeyPair.PrivateKey }}
 PublicKey = {{ .Client.PublicKey }}
 {{if .Client.PresharedKey }}PresharedKey = {{ .Client.PresharedKey }}{{end}}
 AllowedIPs = {{$first :=true}}{{range .Client.AllocatedIPs }}{{if $first}}{{$first = false}}{{else}},{{end}}{{.}}{{end}}{{range .Client.ExtraAllowedIPs }},{{.}}{{end}}{{end}}
-{{if .globalSettings.PersistentKeepalive}}PersistentKeepalive = {{ .globalSettings.PersistentKeepalive }}{{end}}
+{{if $.globalSettings.PersistentKeepalive}}PersistentKeepalive = {{ $.globalSettings.PersistentKeepalive }}{{end}}
 {{if .Client.Endpoint }}Endpoint = {{ .Client.Endpoint }}{{end}}
 {{end}}
\ No newline at end of file