software/mail-server: use automated_local_dns URL for local DNS slaves

software/mail-server/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = 403a4a362b2ffec05f8d0b591bab92fa
 
 [template-default]
 _update_hash_filename_ = instance-default.cfg.in
-md5sum = 89a7224c3dd9356bf262100816b67f73
+md5sum = 73c1fe98a12465369450cb8f3340881b
 
 [dovecot.jinja2.conf]
 _update_hash_filename_ = dovecot.jinja2.conf

software/mail-server/instance-default-input-schema.json

@@ -3,11 +3,11 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Input Parameters",
   "properties": {
-    "dns_sr_url": {
-      "default": "",
-      "title": "DNS SR URL",
-      "description": "URL of the SR running the DNS server",
-      "type": "string"
+    "request_dns": {
+      "title": "Request DNS",
+      "description": "Request local DNS to a core network running on the same node",
+      "type": "boolean",
+      "default": true
     }
   }
 }

software/mail-server/instance-default.cfg.in

@@ -195,7 +195,7 @@ recipe = slapos.cookbook:publish
 imap-port = 10143
 smtp-port = 10025
 imap-smtp-ipv6 = ${slap-configuration:ipv6-random}
-{% if slapparameter_dict.get('dns_sr_url', '') %}
+{% if slapparameter_dict.get('request_dns', '') %}
 domain = ${request-dns-entry:connection-domain}
 {% endif %}
 
@@ -216,7 +216,7 @@ config-port = 10025
 [request-dns-entry]
 name = dns-mail-entry
 recipe = slapos.cookbook:request.serialised
-software-url = {{ slapparameter_dict['dns_sr_url'] }}
+software-url = automated_local_dns
 software-type = core-network
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}
@@ -302,7 +302,7 @@ parts =
   imap-listen-promise
   smtp-listen-promise
   {{ part_list | join('\n  ') }}
-{% if slapparameter_dict.get('dns_sr_url', '') %}
+{% if slapparameter_dict.get('request_dns', '') %}
   request-dns-entry
 {% endif %}