diff options
| author | Kajetan <[email protected]> | 2023-11-07 21:32:55 +0100 |
|---|---|---|
| committer | Kajetan <[email protected]> | 2023-11-07 21:32:55 +0100 |
| commit | f4da11b7bcff3bd2ca0c13606cd735ce2a23b269 (patch) | |
| tree | 4ba695ffafedeb0d995dc67c7ed6662b9260a0da | |
| parent | 2e094d907a78055631bd126b3feb25008089fb34 (diff) | |
Schema regex improvements
| -rw-r--r-- | schemas/config/2.0.schema.json | 12 | ||||
| -rw-r--r-- | schemas/config/3.0.schema.json | 12 |
2 files changed, 16 insertions, 8 deletions
diff --git a/schemas/config/2.0.schema.json b/schemas/config/2.0.schema.json index 55c46823..4ee0fb71 100644 --- a/schemas/config/2.0.schema.json +++ b/schemas/config/2.0.schema.json @@ -2244,18 +2244,22 @@ "HostAndPortWithTCP": { "description": "Host and port with tcp:// prefix", "type": "string", - "pattern": "^(tcp://[0-9a-zA-Z_.-]+|):[0-9]{1,5}$", + "pattern": "^(((tcp:\/\/[0-9a-zA-Z_.-]+|)|\\${([^}]+)}):([0-9]{1,5}||\\${([^}]+)}))|\\${([^}]+)}$", "examples": [ - "tcp://127.0.0.1:443" + "tcp://127.0.0.1:443", + "${TCP:-tcp://127.0.0.1:443}", + "tcp://127.0.0.1:${TCP_PORT}" ] }, "HostAndPort": { "description": "Host and port", "type": "string", - "pattern": "^([0-9a-zA-Z_.-]+|):[0-9]{1,5}$", + "pattern": "^(([0-9a-zA-Z_.-]+|\\${([^}]+)}):([0-9]{1,5}|\\${([^}]+)})|\\${([^}]+)})$", "examples": [ "127.0.0.1:443", - ":8080" + ":8080", + "0.0.0.0:${HTTP_PORT:-8080}", + "${HTTP_HOST:-127.0.0.1:8000}" ] }, "LogMode": { diff --git a/schemas/config/3.0.schema.json b/schemas/config/3.0.schema.json index d008b8da..fe8abd4d 100644 --- a/schemas/config/3.0.schema.json +++ b/schemas/config/3.0.schema.json @@ -2362,18 +2362,22 @@ "HostAndPortWithTCP": { "description": "Host and port with tcp:// prefix", "type": "string", - "pattern": "^(tcp://[0-9a-zA-Z_.-]+|):[0-9]{1,5}$", + "pattern": "^(((tcp:\/\/[0-9a-zA-Z_.-]+|)|\\${([^}]+)}):([0-9]{1,5}||\\${([^}]+)}))|\\${([^}]+)}$", "examples": [ - "tcp://127.0.0.1:443" + "tcp://127.0.0.1:443", + "${TCP:-tcp://127.0.0.1:443}", + "tcp://127.0.0.1:${TCP_PORT}" ] }, "HostAndPort": { "description": "Host and port", "type": "string", - "pattern": "^([0-9a-zA-Z_.-]+|):[0-9]{1,5}$", + "pattern": "^(([0-9a-zA-Z_.-]+|\\${([^}]+)}):([0-9]{1,5}|\\${([^}]+)})|\\${([^}]+)})$", "examples": [ "127.0.0.1:443", - ":8080" + ":8080", + "0.0.0.0:${HTTP_PORT:-8080}", + "${HTTP_HOST:-127.0.0.1:8000}" ] }, "LogMode": { |