Merge pull request #13 from bnhf/develop-2

Make DNS server fields optional and flexible
bnhf · Dec 8, 2022 · 60e721d · 60e721d
2 parents 8f45fd7 + b2df6d4
commit 60e721d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/conf/openvpn-server-config.tpl b/conf/openvpn-server-config.tpl
@@ -12,8 +12,8 @@ ecdh-curve prime256v1
 topology subnet
 {{ .Server }}
 ifconfig-pool-persist {{ .IfconfigPoolPersist }}
-push "dhcp-option DNS {{ .DNSServerOne }}"
-push "dhcp-option DNS {{ .DNSServerTwo }}"
+{{ .DNSServerOne }}"
+{{ .DNSServerTwo }}"
 
 keepalive {{ .Keepalive }}
 remote-cert-tls client

diff --git a/models/models.go b/models/models.go
@@ -99,8 +99,8 @@ func createDefaultOVConfig() {
 			Dev:                 "tap0",
 			Port:                1194,
 			Proto:               "udp",
-			DNSServerOne:        "8.8.8.8",
-			DNSServerTwo:        "8.8.4.4",
+			DNSServerOne:        "# push \"dhcp-option DNS 8.8.8.8\"",
+			DNSServerTwo:        "# push \"dhcp-option DNS 8.8.4.4\"",
 			Cipher:              "AES-256-GCM",
 			Auth:                "SHA256",
 			Dh:                  "none",

diff --git a/views/ovconfig.html b/views/ovconfig.html
@@ -42,17 +42,17 @@ <h3 class="box-title">Edit configuration</h3>
       </div>
 
       <div class="form-group">
-        <label for="name">DNSServerOne</label>
+        <label for="name">DNS Server #1 (optional)</label>
         <input type="text" class="form-control" name="DNSServerOne" id="DNSServerOne" placeholder="Enter the first DNS server"
           value="{{ .Settings.DNSServerOne }}">
-        <span class="help-block">Enter the first DNS server</span>
+        <span class="help-block">Uncomment if you want to push a DNS server to the client -- primarily for TAP clients (can be used for comments or left empty as well)</span>
       </div>
 
       <div class="form-group">
-        <label for="name">DNSServerTwo</label>
+        <label for="name">DNS Server #2 (optional)</label>
         <input type="text" class="form-control" name="DNSServerTwo" id="DNSServerTwo" placeholder="Enter the second DNS server"
           value="{{ .Settings.DNSServerTwo }}">
-        <span class="help-block">Enter the second DNS server</span>
+        <span class="help-block">Uncomment if you want to push a DNS server to the client -- primarily for TAP clients (can be used for comments or left empty as well)</span>
       </div>
 
       <div class="form-group">