Rename 'is_configured' to 'running'

NethServer · Jul 30, 2024 · 5b1197a · 5b1197a
1 parent fb922e2
commit 5b1197a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/imageroot/actions/get-configuration/10get b/imageroot/actions/get-configuration/10get
@@ -21,8 +21,8 @@ if config["interface"] != "" and config["dhcp-server"]["start"] == "" and config
 config["are_dns_bound"] = network.are_ports_53_bound()
 try:
     p = subprocess.run(['systemctl', 'is-active', '-q', os.environ['MODULE_ID']])
-    config['is_configured'] = (p.returncode == 0)
+    config['running'] = (p.returncode == 0)
 except:
-    config['is_configured'] = False
+    config['running'] = False
 
 json.dump(config, sys.stdout)
diff --git a/imageroot/actions/get-configuration/validate-output.json b/imageroot/actions/get-configuration/validate-output.json
@@ -97,7 +97,7 @@
                 "secondary-server"
             ]
         },
-        "is_configured": {
+        "running": {
             "description": "True if dnsmasq is configured",
             "type": "boolean"
         },
@@ -110,7 +110,7 @@
         "interface",
         "dhcp-server",
         "dns-server",
-        "is_configured",
+        "running",
         "are_dns_bound"
     ]
 }
diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -162,7 +162,7 @@
                 <div class="title-description mg-bottom-xlg">
                   {{ $t("settings.DNS_description") }}
                 </div>
-                  <cv-row v-if="are_dns_bound && !is_configured">
+                  <cv-row v-if="are_dns_bound && !running">
                   <cv-column>
                     <NsInlineNotification
                       kind="info"
@@ -177,7 +177,7 @@
                   v-model="dnsEnableField"
                   value="dnsEnableField"
                   formItem
-                  :disabled="are_dns_bound && !is_configured"
+                  :disabled="are_dns_bound && !running"
                   ref="dnsEnableField"
                 >
                   <template slot="text-left">{{
@@ -262,7 +262,7 @@ export default {
       dhcpEndField: "",
       dhcpLeaseField: 12,
       are_dns_bound: false,
-      is_configured: false,
+      running: false,
       dnsEnableField: false,
       dnsPrimaryField: "",
       dnsSecondaryField: "",
@@ -420,7 +420,7 @@ export default {
       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"];
+      this.running = config["running"];
     },
     validateConfigureModule() {
       this.clearErrors(this);