Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ncm-ccm: Fix wrapping and indentation in pan #1749

Merged
merged 1 commit into from
Nov 29, 2024
Merged

ncm-ccm: Fix wrapping and indentation in pan #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ncm-ccm/src/main/pan/components/ccm/schema.pan
View file
Open in desktop
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
View file
Open in desktop
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";