From eb0be6f6f975850991bb080e09bc358026383cba Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Fri, 23 Aug 2013 15:56:24 +0400 Subject: [PATCH] Replaced AD Domain Name with DNS Domain Name restriction Note: Only first 15 chars or chars before first period is used as NetBIOS name. We also should add later special field for NetBIOS names. Change-Id: I10d4bfd2a0a6a35dbb3e9fca437ceae9e853cc1b --- muranodashboard/panel/services/1-ad.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/muranodashboard/panel/services/1-ad.yaml b/muranodashboard/panel/services/1-ad.yaml index 8b5588b22..66e50b5e9 100644 --- a/muranodashboard/panel/services/1-ad.yaml +++ b/muranodashboard/panel/services/1-ad.yaml @@ -24,15 +24,16 @@ forms: type: string label: Domain Name description: >- - Enter a desired name for a new domain. This name should fit - in standard Windows domain name requirements: it should contain - only A-Z, a-z, 0-9, and (-) and should not end with a dash. + Enter a desired name for a new domain. This name should fit to + DNS Domain Name requirements: it should contain + only A-Z, a-z, 0-9, (.) and (-) and should not end with a dash. DNS server will be automatically set up on each of the Domain - Controller instances. The domain length is restricted by 15 characters. + Controller instances. Note: Only first 15 characters or characters + before first period is used as NetBIOS name. attributeNames: [name, domain] minLength: 2 - maxLength: 15 - regexpValidator: '^([a-zA-Z\d][a-zA-Z\d-]*[a-zA-Z\d]\.){1,}[a-zA-Z\d][a-zA-Z\d-]*[a-zA-Z\d]$' + maxLength: 255 + regexpValidator: '^(?=.{2,255}$)[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?(?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$' errorMessages: invalid: >- Only letters, numbers and dashes in the middle are