diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-01-09 16:21:36 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-01-09 16:21:36 +0100 |
| commit | 27187e96127e06601fb2addb5285b15692f27525 (patch) | |
| tree | aa1ea8dec7a36e5ee892477f956b51044d736adc | |
| parent | 7bf02bfb68139fca05523aa33f73a593211aa388 (diff) | |
| download | vyos-1x-27187e96127e06601fb2addb5285b15692f27525.tar.gz vyos-1x-27187e96127e06601fb2addb5285b15692f27525.zip | |
xml: T5738: reuse existing alpha-numeric-hyphen-underscore building block
| -rw-r--r-- | interface-definitions/container.xml.in | 2 | ||||
| -rw-r--r-- | interface-definitions/include/haproxy/rule-backend.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/include/haproxy/rule-frontend.xml.i | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in index ad1815604..04318a7c9 100644 --- a/interface-definitions/container.xml.in +++ b/interface-definitions/container.xml.in @@ -131,7 +131,7 @@ <properties> <help>Add custom environment variables</help> <constraint> - <regex>[-_a-zA-Z0-9]+</regex> + #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> </constraint> <constraintErrorMessage>Environment variable name must be alphanumeric and can contain hyphen and underscores</constraintErrorMessage> </properties> diff --git a/interface-definitions/include/haproxy/rule-backend.xml.i b/interface-definitions/include/haproxy/rule-backend.xml.i index b2be4fde4..1df9d5dcf 100644 --- a/interface-definitions/include/haproxy/rule-backend.xml.i +++ b/interface-definitions/include/haproxy/rule-backend.xml.i @@ -47,7 +47,7 @@ <properties> <help>Server name</help> <constraint> - <regex>[-_a-zA-Z0-9]+</regex> + #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> </constraint> <constraintErrorMessage>Server name must be alphanumeric and can contain hyphen and underscores</constraintErrorMessage> </properties> diff --git a/interface-definitions/include/haproxy/rule-frontend.xml.i b/interface-definitions/include/haproxy/rule-frontend.xml.i index 001ae2d80..aeee1202e 100644 --- a/interface-definitions/include/haproxy/rule-frontend.xml.i +++ b/interface-definitions/include/haproxy/rule-frontend.xml.i @@ -47,7 +47,7 @@ <properties> <help>Backend name</help> <constraint> - <regex>[-_a-zA-Z0-9]+</regex> + #include <include/constraint/alpha-numeric-hyphen-underscore.xml.i> </constraint> <constraintErrorMessage>Server name must be alphanumeric and can contain hyphen and underscores</constraintErrorMessage> </properties> |