Skip to content

Commit

Permalink
Merge pull request #1749 from jrha/indentation-ccm
Browse files Browse the repository at this point in the history
ncm-ccm: Fix wrapping and indentation in pan
  • Loading branch information
jrha authored Nov 29, 2024
2 parents 072a014 + a31167c commit 9a05c2a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 3 additions & 2 deletions ncm-ccm/src/main/pan/components/ccm/schema.pan
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ include 'quattor/types/component';
include 'pan/types';
include if_exists('components/accounts/functions');

@documentation {
@documentation{
kerberos_principal_string is a string with format `principal[/component1[/component2[...]]]@REALM`
}
type kerberos_principal_string = string with {
Expand Down Expand Up @@ -87,7 +87,8 @@ type ccm_component = {
is_user_or_group('group', SELF)
} else {
true;
}}
}
}
@{Whether the profiles should be world-readable. Defaults to 0. }
'world_readable' : long(0..1) = 0
@{If `profile` is not a URL, a profile url will be calculated from `base_url` and the local hostname.}
Expand Down
6 changes: 5 additions & 1 deletion ncm-ccm/src/test/resources/base.pan
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ prefix "/software/components/ccm";
"configFile" = "/etc/ccm.conf";
"ca_file" = "/etc/sindes/ca/ca.crt";
"version" = "1.2.3";
"trust" = list("user/component.something/[email protected]", "[email protected]", "host/[email protected]");
"trust" = list(
"user/component.something/[email protected]",
"[email protected]",
"host/[email protected]",
);
"group_readable" = "theadmins";
"principal" = "user/component.something/[email protected]";
"keytab" = "/some/path/to/key.tab";

0 comments on commit 9a05c2a

Please sign in to comment.