apache-frontend: Fix publish condition

No custom_http nor custom_https shall publish information normally calculated.

/reviewed-on nexedi/slapos!340

software/apache-frontend/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = 9e76028df7e93d3e32982884d5dc0913
 
 [template-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = 24e514ad6f15859229db46f24a8cd280
+md5sum = aca854dad0354516e42739aeafe3cd26
 
 [template-slave-configuration]
 filename = templates/custom-virtualhost.conf.in
@@ -43,7 +43,7 @@ md5sum = a56045e7b53ff00ab34d2a8f911fc1a1
 
 [template-custom-slave-list]
 filename = templates/apache-custom-slave-list.cfg.in
-md5sum = 24e514ad6f15859229db46f24a8cd280
+md5sum = aca854dad0354516e42739aeafe3cd26
 
 [template-not-found-html]
 filename = templates/notfound.html

software/apache-frontend/templates/apache-custom-slave-list.cfg.in

@@ -101,7 +101,7 @@ crl = {{ custom_ssl_directory }}/crl/
 {%     do cached_server_dict.__setitem__(slave_reference, slave_configuration_section_name) -%}
 {%   endif -%}
 
-{%   if not slave_instance.has_key('apache_custom_http') %}
+{%   if not slave_instance.has_key('apache_custom_http') and not slave_instance.has_key('apache_custom_https') %}
 {%     do slave_publish_dict.__setitem__('domain', slave_instance.get('custom_domain')) -%}
 {%     do slave_publish_dict.__setitem__('url', "http://%s" % slave_instance.get('custom_domain')) -%}
 {%     do slave_publish_dict.__setitem__('site_url', "http://%s" % slave_instance.get('custom_domain')) -%}