fix technical solution 07

aliyun · Mar 28, 2024 · ca849a0 · ca849a0
1 parent 443e24d
commit ca849a0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/documents/solution/high-availability-architecture/classic-architecture-on-the-cloud.yml b/documents/solution/high-availability-architecture/classic-architecture-on-the-cloud.yml
@@ -69,12 +69,12 @@ Parameters:
         symbol in)
       zh-cn: >-
         服务器登录密码，长度8-30，必须包含三项（大写字母、小写字母、数字、 ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/
-        中的特殊符号）
+        中的特殊符号），不能以特殊字符开头。
     ConstraintDescription:
       en: >-
         Length 8-30, must contain three(Capital letters, lowercase letters,
         numbers, ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/ Special symbol in)
-      zh-cn: '长度8-30，必须包含三项（大写字母、小写字母、数字、 ()`~!@#$%^&*_-+=|{}[]:;''<>,.?/ 中的特殊符号）'
+      zh-cn: '长度8-30，必须包含三项（大写字母、小写字母、数字、 ()`~!@#$%^&*_-+=|{}[]:;''<>,.?/ 中的特殊符号），不能以特殊字符开头。'
     AssociationProperty: 'ALIYUN::ECS::Instance::Password'
     NoEcho: true
   PolarDBName:
@@ -104,13 +104,13 @@ Parameters:
       en: >-
         Software login password, There are three types of uppercase and lowercase letters, 
         numbers, and special characters, with a length of 8~32 characters; the special characters are !@#$%^&*()_+-=
-      zh-cn: 软件登录密码，大小写字母、数字、特殊字符占三种，长度为8~32个字符；特殊字符为!@#$%^&*()_+-=
+      zh-cn: 软件登录密码，大小写字母、数字、特殊字符占三种，长度为8~32个字符，不能以特殊字符开头，特殊字符为!@#$%^&*()_+-=
     ConstraintDescription:
       en: >-
         There are three types of uppercase and lowercase letters, numbers, and special characters, 
         with a length of 8~32 characters; the special characters are !@#$%^&*()_+-=
-      zh-cn: '大小写字母、数字、特殊字符占三种，长度为8~32个字符；特殊字符为!@#$%^&*()_+-='
-    AllowedPattern: '^[a-zA-Z](?=.*[a-zA-Z])(?=.*[0-9])(?=.*[!@#$%^&*()_+\-=])[A-Za-z\d!@#$%^&*()_+\-=]{8,32}$'
+      zh-cn: '大小写字母、数字、特殊字符占三种，长度为8~32个字符，不能以特殊字符开头，特殊字符为!@#$%^&*()_+-='
+    AllowedPattern: '^[a-zA-Z](?=.*[a-zA-Z])(?=.*[0-9])(?=.*[!@#$%^&*()_+\-=])[A-Za-z\d!@#$%^&*()_+\-=]{7,31}$'
     NoEcho: true
   CommonName:
     Type: String

diff --git a/documents/solution/security-and-compliance/protect-web-applications-with-WAF.yml b/documents/solution/security-and-compliance/protect-web-applications-with-WAF.yml
@@ -26,6 +26,26 @@ Parameters:
     AssociationPropertyMetadata:
       ZoneId: VSwitchZoneId
     Default: ecs.g6.large
+  InstancePassword:
+    Type: String
+    Label:
+      en: Instance Password
+      zh-cn: 实例密码
+    Description:
+      en: >-
+        Server login password, Length 8-30, must contain three(Capital letters,
+        lowercase letters, numbers, ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/ Special
+        symbol in)
+      zh-cn: >-
+        服务器登录密码，长度8-30，必须包含三项（大写字母、小写字母、数字、 ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/
+        中的特殊符号），不能以特殊字符开头。
+    ConstraintDescription:
+      en: >-
+        Length 8-30, must contain three(Capital letters, lowercase letters,
+        numbers, ()`~!@#$%^&*_-+=|{}[]:;'<>,.?/ Special symbol in)
+      zh-cn: '长度8-30，必须包含三项（大写字母、小写字母、数字、 ()`~!@#$%^&*_-+=|{}[]:;''<>,.?/ 中的特殊符号），不能以特殊字符开头。'
+    AssociationProperty: 'ALIYUN::ECS::Instance::Password'
+    NoEcho: true
 Resources:
   EcsVpc:
     Type: ALIYUN::ECS::VPC
@@ -88,6 +108,8 @@ Resources:
         Ref: EcsVSwitch
       SpotStrategy: SpotAsPriceGo
       MaxAmount: 1
+      Password:
+        Ref: InstancePassword
   InstallWeb:
     Type: ALIYUN::OOS::Execution
     Properties: