network_dns conf

deprecated-conf.sh

@@ -24,3 +24,8 @@ FTP_INCOMING_USERS=
 # -- HOTFOLDER --
 # csv-separated
 HOTFOLDERS='/home/ftp/storage/hotfolder'
+
+# -- Network configuration --
+NETWORK_DNS1=
+NETWORK_DNS2=
+NETWORK_DNS3=

global-conf.sh

@@ -86,9 +86,7 @@ CELERITY_WORKER_IP='127.0.1.1'
 # -- Network configuration --
 # applied with client configuration step
 NETWORK_IP=
-NETWORK_DNS1=
-NETWORK_DNS2=
-NETWORK_DNS3=
+NETWORK_DNS=
 NETWORK_MASK=
 NETWORK_GATEWAY=
 # define this if IP is NATed

tests/test_dns_records.py

@@ -105,8 +105,15 @@ def check_resolver(conf: dict, resolvers: set) -> tuple:
     errors = 0
     resolver_set = False
 
-    for key in ("NETWORK_DNS1", "NETWORK_DNS2", "NETWORK_DNS3"):
-        conf_resolver = conf.get(key)
+    conf_resolvers = conf.get("NETWORK_DNS").split(",")
+    if not conf_resolvers:
+        # backward compatibility
+        conf_resolvers = [
+            conf.get(r)
+            for r in ("NETWORK_DNS1", "NETWORK_DNS2", "NETWORK_DNS3")
+            if conf.get(r)
+        ]
+    for conf_resolver in conf_resolvers:
         if conf_resolver:
             resolver_set = True
             if conf_resolver not in resolvers: