diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-03-10 20:38:34 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-03-10 21:16:44 +0100 |
| commit | fe82d86d3e87cb8d92ebc9d0652c08e3dd79a12c (patch) | |
| tree | 47eb28b4afe3ad104e8542461cde985cec2d125d /interface-definitions/include | |
| parent | b4af532dd531c23bc1ad84cca290916be55357bf (diff) | |
| download | vyos-1x-fe82d86d3e87cb8d92ebc9d0652c08e3dd79a12c.tar.gz vyos-1x-fe82d86d3e87cb8d92ebc9d0652c08e3dd79a12c.zip | |
container: T4959: add registry authentication option
Container registry CLI node changed from leafNode to tagNode with the same
defaults. In addition we can now configure an authentication option per
registry.
Diffstat (limited to 'interface-definitions/include')
3 files changed, 32 insertions, 26 deletions
diff --git a/interface-definitions/include/generic-password.xml.i b/interface-definitions/include/generic-password.xml.i new file mode 100644 index 000000000..76d5f12d8 --- /dev/null +++ b/interface-definitions/include/generic-password.xml.i @@ -0,0 +1,15 @@ +<!-- include start from generic-password.xml.i --> +<leafNode name="password"> + <properties> + <help>Password used for authentication</help> + <valueHelp> + <format>txt</format> + <description>Password</description> + </valueHelp> + <constraint> + <regex>[[:ascii:]]{1,128}</regex> + </constraint> + <constraintErrorMessage>Password is limited to ASCII characters only, with a total length of 128</constraintErrorMessage> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/include/generic-username.xml.i b/interface-definitions/include/generic-username.xml.i new file mode 100644 index 000000000..678f30ddf --- /dev/null +++ b/interface-definitions/include/generic-username.xml.i @@ -0,0 +1,15 @@ +<!-- include start from generic-username.xml.i --> +<leafNode name="username"> + <properties> + <help>Username used for authentication</help> + <valueHelp> + <format>txt</format> + <description>Username</description> + </valueHelp> + <constraint> + <regex>[[:ascii:]]{1,128}</regex> + </constraint> + <constraintErrorMessage>Username is limited to ASCII characters only, with a total length of 128</constraintErrorMessage> + </properties> +</leafNode> +<!-- include end --> diff --git a/interface-definitions/include/interface/authentication.xml.i b/interface-definitions/include/interface/authentication.xml.i index ac06faef5..0bd792209 100644 --- a/interface-definitions/include/interface/authentication.xml.i +++ b/interface-definitions/include/interface/authentication.xml.i @@ -4,32 +4,8 @@ <help>Authentication settings</help> </properties> <children> - <leafNode name="username"> - <properties> - <help>Username used for authentication</help> - <valueHelp> - <format>txt</format> - <description>Username</description> - </valueHelp> - <constraint> - <regex>[[:ascii:]]{1,128}</regex> - </constraint> - <constraintErrorMessage>Username is limited to ASCII characters only, with a total length of 128</constraintErrorMessage> - </properties> - </leafNode> - <leafNode name="password"> - <properties> - <help>Password used for authentication</help> - <valueHelp> - <format>txt</format> - <description>Password</description> - </valueHelp> - <constraint> - <regex>[[:ascii:]]{1,128}</regex> - </constraint> - <constraintErrorMessage>Password is limited to ASCII characters only, with a total length of 128</constraintErrorMessage> - </properties> - </leafNode> + #include <include/generic-username.xml.i> + #include <include/generic-password.xml.i> </children> </node> <!-- include end --> |