From a31167cc4e12b9a0026cb5ee7bb40acff1dc1197 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 28 Nov 2024 14:22:26 +0000 Subject: [PATCH] ncm-ccm: Fix wrapping and indentation in pan --- ncm-ccm/src/main/pan/components/ccm/schema.pan | 5 +++-- ncm-ccm/src/test/resources/base.pan | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ncm-ccm/src/main/pan/components/ccm/schema.pan b/ncm-ccm/src/main/pan/components/ccm/schema.pan index 09a0b7d35e..0838b2b7ac 100755 --- a/ncm-ccm/src/main/pan/components/ccm/schema.pan +++ b/ncm-ccm/src/main/pan/components/ccm/schema.pan @@ -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 { @@ -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.} diff --git a/ncm-ccm/src/test/resources/base.pan b/ncm-ccm/src/test/resources/base.pan index 8fa3523bbd..664c45fdb8 100644 --- a/ncm-ccm/src/test/resources/base.pan +++ b/ncm-ccm/src/test/resources/base.pan @@ -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/other.else@MY.REALM", "user2@OTHER.REALM", "host/all.lower.domain@all.lower.realm"); +"trust" = list( + "user/component.something/other.else@MY.REALM", + "user2@OTHER.REALM", + "host/all.lower.domain@all.lower.realm", +); "group_readable" = "theadmins"; "principal" = "user/component.something/other.else@MY.REALM"; "keytab" = "/some/path/to/key.tab";