From e09057abe28e7167a909195952d8b201f334c4ba Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 5 Jan 2018 09:20:14 +0100 Subject: [PATCH] gen-pmg.conf.5-opts.pl: allow to generate docs for subgroups --- gen-pmg.conf.5-opts.pl | 22 ++++++++++++++++++++++ pmgconfig.adoc | 10 ++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/gen-pmg.conf.5-opts.pl b/gen-pmg.conf.5-opts.pl index b2bb2d8..fd928ce 100755 --- a/gen-pmg.conf.5-opts.pl +++ b/gen-pmg.conf.5-opts.pl @@ -14,6 +14,27 @@ my $types = PMG::Config::Base->lookup_types; my $single_section = shift; my $found = 0; +my $key_groups = { + 'mail-relaying' => [ + 'mail' , { + relay => 1, + relaynomx => 1, + relayport => 1, + smarthost => 1, + }], +}; + +my $select_keys; + +if ($single_section) { + if (my $a = $key_groups->{$single_section}) { + my ($sec, $hash) = @$a; + $single_section = $sec; + $select_keys = $hash; + } +} + + foreach my $section (@$types) { my $plugin = PMG::Config::Base->lookup($section); my $schema = $plugin->updateSchema(1); @@ -31,6 +52,7 @@ foreach my $section (@$types) { my ($key, $phash) = @_; return 1 if $key eq 'digest'; return 1 if $key eq 'delete'; + return 1 if $select_keys && !$select_keys->{$key}; return 0; }; diff --git a/pmgconfig.adoc b/pmgconfig.adoc index fa9c9fb..238dfab 100644 --- a/pmgconfig.adoc +++ b/pmgconfig.adoc @@ -221,6 +221,10 @@ ifndef::manvolnum[] image::images/screenshot/pmg-gui-system-options.png[] endif::manvolnum[] + +Those settings are saved to subsection 'admin' in `/etc/pmg/pmg.conf`, +using the following configuration keys: + include::pmg.admin-conf-opts.adoc[] @@ -230,12 +234,14 @@ Mail Proxy Configuration Relaying ~~~~~~~~ - ifndef::manvolnum[] image::images/screenshot/pmg-gui-mailproxy-relaying.png[] endif::manvolnum[] -TODO +Those settings are saved to subsection 'mail' in `/etc/pmg/pmg.conf`, +using the following configuration keys: + +include::pmg.mail-relaying-conf-opts.adoc[] Relay Domains ~~~~~~~~~~~~~