From 0bce263eb7d97d06ce2e369c249d71a368113579 Mon Sep 17 00:00:00 2001 From: James Adams Date: Thu, 28 Nov 2024 14:22:33 +0000 Subject: [PATCH 1/2] ncm-postfix: Fix wrapping and indentation in pan --- ncm-postfix/src/main/pan/components/postfix/schema.pan | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ncm-postfix/src/main/pan/components/postfix/schema.pan b/ncm-postfix/src/main/pan/components/postfix/schema.pan index a6cea2c795..0e610a090f 100644 --- a/ncm-postfix/src/main/pan/components/postfix/schema.pan +++ b/ncm-postfix/src/main/pan/components/postfix/schema.pan @@ -10,11 +10,11 @@ include 'quattor/types/component'; @{ Types of lookup tables (databases) Postfix is capable to handle. } -type postfix_lookup_type_string = string with - match (SELF, "^(btree|cdb|cidr|dbm|environ|fail|hash|internal|ldap" + - "|memcache|mysql|netinfo|nis|nisplus|pcre|pgsql|proxy|regexp" + - "|sdbm|socketmap|sqlite|static|tcp|texthash|unix)$") || - error ("Wrong Postfix lookup type. See http://www.postfix.org/DATABASE_README.html for details"); +type postfix_lookup_type_string = string with match(SELF, + "^(btree|cdb|cidr|dbm|environ|fail|hash|internal|ldap" + + "|memcache|mysql|netinfo|nis|nisplus|pcre|pgsql|proxy|regexp" + + "|sdbm|socketmap|sqlite|static|tcp|texthash|unix)$" +) || error("Wrong Postfix lookup type. See http://www.postfix.org/DATABASE_README.html for details"); @{ Definition of a lookup in Postfix From 6377c16e304f847e14413b783ea2b25fd5c17d05 Mon Sep 17 00:00:00 2001 From: James Adams Date: Mon, 2 Dec 2024 09:28:46 +0000 Subject: [PATCH 2/2] ncm-postfix: Add missing spaces after commas in pan (Fix lint warnings) --- ncm-postfix/src/main/pan/components/postfix/config.pan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncm-postfix/src/main/pan/components/postfix/config.pan b/ncm-postfix/src/main/pan/components/postfix/config.pan index 2309ab28e0..fac4eb70b7 100644 --- a/ncm-postfix/src/main/pan/components/postfix/config.pan +++ b/ncm-postfix/src/main/pan/components/postfix/config.pan @@ -14,4 +14,4 @@ prefix '/software/components/postfix'; 'dispatch' ?= true; 'dependencies/pre' ?= list('spma'); -'/software/packages' = pkg_repl('ncm-postfix','${no-snapshot-version}-${rpm.release}','noarch'); +'/software/packages' = pkg_repl('ncm-postfix', '${no-snapshot-version}-${rpm.release}', 'noarch');