apache-frontend: Add a diferent domain for nginx related services.

software/apache-frontend/common.cfg

@@ -66,7 +66,7 @@ mode = 0644
 [template-slave-list]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/apache-custom-slave-list.cfg.in
-md5sum = 6828096d9ec4333b8c72a2e2ab768ea0 
+md5sum = 377aa36899c963ac65558b4888f8264b 
 mode = 640
 
 [template-slave-configuration]

software/apache-frontend/instance-apache-input-schema.json

@@ -49,6 +49,12 @@
 			"type": "string",
 			"pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$"
 		},
+                "nginx-domain": {
+                        "title": "Nginx Domain",
+                        "description": "Base Domain for create subdomains (ie.: example2.com) for websocket, notebook and eventsource.",
+                        "type": "string",
+                        "pattern": "^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$"
+                },
 		"-frontend-quantity": {
 			"title": "Frontend Replication Quantity",
 			"description": "Quantity of Frontends Replicate.",

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

@@ -71,7 +71,12 @@ crl = {{ custom_ssl_directory }}/crl/
 
 {# Set slave domain if none was defined #}
 {%   if slave_instance.get('custom_domain', None) == None -%}
-{%     do slave_instance.__setitem__('custom_domain', "%s.%s" % (slave_instance.get('slave_reference').replace("-", "").lower(), slapparameter_dict.get('domain'))) -%}
+{%     set domain_prefix = slave_instance.get('slave_reference').replace("-", "").lower() -%}
+{%     if slave_type in NGINX_TYPE_LIST -%}
+{%       do slave_instance.__setitem__('custom_domain', "%s.%s" % (domain_prefix, slapparameter_dict.get('nginx-domain', slapparameter_dict.get('domain')))) -%}
+{%     else -%}
+{%       do slave_instance.__setitem__('custom_domain', "%s.%s" % (domain_prefix, slapparameter_dict.get('domain'))) -%}
+{%     endif -%}
 {%   endif -%}
 
 {%   set enable_cache = (('' ~ slave_instance.get('enable_cache', '')).lower() in TRUE_VALUES and slave_type != 'redirect') -%}