export powerdns server IP and port number

software/powerdns/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = fddea033e1aa9d6147a1a47bd7cc4b62
 
 [template-powerdns]
 filename = instance-powerdns.cfg
-md5sum = 9cd4e436fa432f37b9f8f4de8350581b
+# md5sum = 4b95a3ac8f83bc9310513af6b7699186
 
 [template-pdns-configuration]
 _update_hash_filename_ = template/pdns.conf.jinja2
@@ -26,7 +26,7 @@ md5sum = e45d72de87b4adb89c195ba463be4077
 
 [template-dns-replicate]
 _update_hash_filename_ = instance-powerdns-replicate.cfg.jinja2
-md5sum = a23e241a236f90ae1afbb5bd5ba0b32d
+# md5sum = 1f2ee51342e3bc9cf67f71031c13596f
 
 [iso-list]
 _update_hash_filename_ = template/zz.countries.nexedi.dk.rbldnsd

software/powerdns/instance-powerdns-replicate.cfg.jinja2

@@ -94,6 +94,7 @@ monitor-url-list +=
 [replicate]
 <= slap-connection
 recipe = slapos.cookbook:requestoptional
+name = replicate
 {% set dns_software_url_key = "-dns-software-release-url" %}
 {% if dns_software_url_key in slapparameter_dict %}
 software-url = {{ slapparameter_dict.pop(dns_software_url_key) }}
@@ -101,7 +102,7 @@ software-url = {{ slapparameter_dict.pop(dns_software_url_key) }}
 software-url = ${slap-connection:software-release-url}
 {% endif %}
 software-type = {{dns_type}}
-return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url
+return = private-ipv4 public-ipv4 slave-instance-information-list monitor-base-url powerdns-ipv6 powerdns-port slap-connection
 config-server-admin = {{ server_admin }}
 config-ns-record = {{ ns_record }}
 {% for parameter, value in slapparameter_dict.items() -%}
@@ -120,6 +121,8 @@ ns-record = {{ ns_record }}
 monitor-url = ${monitor-publish-parameters:monitor-url}
 monitor-user = ${monitor-publish-parameters:monitor-user}
 monitor-password = ${monitor-publish-parameters:monitor-password}
+powerdns-ip = ${replicate:connection-powerdns-ipv6}
+powerdns-port = ${replicate:connection-powerdns-port}
 {% set monitor_interface_url = slapparameter_dict.get('monitor-interface-url', 'https://monitor.app.officejs.com') -%}
 {% if monitor_interface_url -%}
 monitor-setup-url = {{ monitor_interface_url }}/#page=settings_configurator&url=${monitor-publish-parameters:monitor-url}

software/powerdns/instance-powerdns.cfg

@@ -147,6 +147,8 @@ recipe = slapos.cookbook:publish
 monitor-url = $${monitor-publish-parameters:monitor-url}
 monitor-user = $${monitor-publish-parameters:monitor-user}
 monitor-password = $${monitor-publish-parameters:monitor-password}
+powerdns-ipv6 = $${pdns:ipv6}
+powerdns-port = $${pdns:port}
 
 [buildout]
 parts =