feat: Add DNS server running check and disabled dns toggle

NethServer · Jul 30, 2024 · 7d91515 · 7d91515
1 parent 9798989
commit 7d91515
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json
@@ -53,7 +53,9 @@
         "dhcp-server_invalid_type": "Number required",
         "dhcp-server_number_gte": "Enter a positive number",
         "dns-server_format": "IPv4 format required",
-        "dns-server_number_one_of": "IPv4 or IPv6 required"
+        "dns-server_number_one_of": "IPv4 or IPv6 required",
+        "dns_server_is_running": "A DNS server is running",
+        "dns_server_is_running_description": "You cannot configure the dns feature if a DNS server is already running on this node. A module like samba, dnsmasq or another dnsmasq instance may be using the DNS port."
     },
     "dns_records": {
         "title": "DNS records",

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -162,11 +162,22 @@
                 <div class="title-description mg-bottom-xlg">
                   {{ $t("settings.DNS_description") }}
                 </div>
+                  <cv-row v-if="are_dns_bound && !is_configured">
+                  <cv-column>
+                    <NsInlineNotification
+                      kind="info"
+                      :title="$t('settings.dns_server_is_running')"
+                      :description="$t('settings.dns_server_is_running_description')"
+                      :showCloseButton="false"
+                    />
+                  </cv-column>
+                </cv-row>
                 <NsToggle
                   :label="$t('settings.DNS_enable_label')"
                   v-model="dnsEnableField"
                   value="dnsEnableField"
                   formItem
+                  :disabled="are_dns_bound && !is_configured"
                   ref="dnsEnableField"
                 >
                   <template slot="text-left">{{
@@ -250,6 +261,8 @@ export default {
       dhcpStartField: "",
       dhcpEndField: "",
       dhcpLeaseField: 12,
+      are_dns_bound: false,
+      is_configured: false,
       dnsEnableField: false,
       dnsPrimaryField: "",
       dnsSecondaryField: "",
@@ -406,6 +419,8 @@ export default {
       this.dnsEnableField = dns_server["enabled"];
       this.dnsPrimaryField = dns_server["primary-server"];
       this.dnsSecondaryField = dns_server["secondary-server"];
+      this.are_dns_bound = config["are_dns_bound"];
+      this.is_configured = config["is_configured"];
     },
     validateConfigureModule() {
       this.clearErrors(this);