Merge pull request #1581 from stdweird/minor_changes

metaconfig: add minor local leftovers changes
quattor · Jul 21, 2023 · 4dd0079 · 4dd0079
2 parents 0e8cf35 + 986a599
commit 4dd0079
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/ncm-metaconfig/src/main/metaconfig/rsyslog/pan/config.pan b/ncm-metaconfig/src/main/metaconfig/rsyslog/pan/config.pan
@@ -7,7 +7,7 @@ bind "/software/components/metaconfig/services/{/etc/rsyslog.conf}/contents" = r
 prefix "/software/components/metaconfig/services/{/etc/rsyslog.conf}";
 "daemons/rsyslog" = "restart";
 "module" = "rsyslog/main";
-"mode" = 0644;
+"mode" = 0640;
 
 bind "/software/components" = dict with {
  if (exists(SELF['syslog'])) {

diff --git a/ncm-metaconfig/src/main/metaconfig/rsyslog/pan/inputs.pan b/ncm-metaconfig/src/main/metaconfig/rsyslog/pan/inputs.pan
@@ -78,6 +78,7 @@ type rsyslog_input_kafka = {
  'broker': string[]
  'topic': string
  'consumergroup' ? string
+ 'ConfParam' ? string[]
  'ParseHostname' ? string with match(SELF, '^(on|off)$')
 };
 

diff --git a/ncm-metaconfig/src/main/metaconfig/zkrsync/pan/schema.pan b/ncm-metaconfig/src/main/metaconfig/zkrsync/pan/schema.pan
@@ -33,6 +33,7 @@ type zkrsync_config = {
  'delete' ? boolean = false
  'checksum' ? boolean = false
  'hardlinks' ? boolean = false
+ 'inplace' ? boolean = false
  'timeout' ? long(0..)
  # client opts
  'verifypath' ? boolean = true