gen-pmg.conf.5-opts.pl - skip digest and delete properties

diff --git a/gen-pmg.conf.5-opts.pl b/gen-pmg.conf.5-opts.pl
index 601d14f18975f60fda173cd5418fd30a85103889..32e3efc0e3ee2a92881390167f3c5155eedb0aa6 100755 (executable)
--- a/gen-pmg.conf.5-opts.pl
+++ b/gen-pmg.conf.5-opts.pl
@@ -17,8 +17,16 @@ foreach my $section (@$types) {
     my $properties = $schema->{properties};
     
     print ".Section '$section'\n\n";
+
+    my $filter = sub {
+       my ($key, $phash) = @_;
+       return 1 if $key eq 'digest';
+       return 1 if $key eq 'delete';
+       return 0;
+    };
     
-    print PVE::RESTHandler::dump_properties($properties);
+    print PVE::RESTHandler::dump_properties(
+       $properties, 'asciidoc', 'config', $filter);
 }
  
 exit(0);

diff --git a/pmg.conf.5-opts.adoc b/pmg.conf.5-opts.adoc
index d3d52facd639b947357d04916ae2963af46e007d..71a6338cd46c4d727959d07cafcc7763a20558d0 100644 (file)
--- a/pmg.conf.5-opts.adoc
+++ b/pmg.conf.5-opts.adoc
@@ -8,18 +8,10 @@ Use advanced filters for statistic.
 
 Send daily reports.
 
-`delete`: `<string>` ::
-
-A list of settings you want to delete.
-
 `demo`: `<boolean>` ('default =' `0`)::
 
 Demo mode - do not start SMTP filter.
 
-`digest`: `<string>` ::
-
-Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
-
 `email`: `<string>` ('default =' `admin@domain.tld`)::
 
 Administrator E-Mail address.
@@ -54,14 +46,6 @@ Files larger than this limit won't be scanned.
 
 ClamAV database mirror server.
 
-`delete`: `<string>` ::
-
-A list of settings you want to delete.
-
-`digest`: `<string>` ::
-
-Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
-
 `maxcccount`: `<integer> (0 - N)` ('default =' `0`)::
 
 This option sets the lowest number of Credit Card or Social Security numbers found in a file to generate a detect.
@@ -88,14 +72,6 @@ How many simultaneous connections any client is allowed to make to this service.
 
 The maximal number of connection attempts any client is allowed to make to this service per minute. To disable this feature, specify a limit of 0.
 
-`delete`: `<string>` ::
-
-A list of settings you want to delete.
-
-`digest`: `<string>` ::
-
-Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
-
 `dnsbl_sites`: `<string>` ::
 
 Optional list of DNS white/blacklist domains (see postscreen_dnsbl_sites parameter).
@@ -188,10 +164,6 @@ Add TLS received header.
 
 Enable TLS Logging.
 
-`use_rbl`: `<boolean>` ('default =' `1`)::
-
-Use Realtime Blacklists.
-
 `verifyreceivers`: `<450 | 550>` ::
 
 Enable receiver verification. The value spefifies the numerical reply code when the Postfix SMTP server rejects a recipient address.
@@ -202,19 +174,15 @@ Enable receiver verification. The value spefifies the numerical reply code when
 
 Additional score for bounce mails.
 
-`delete`: `<string>` ::
-
-A list of settings you want to delete.
+`clamav_heuristic_score`: `<integer> (0 - 1000)` ('default =' `3`)::
 
-`digest`: `<string>` ::
-
-Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
+Score for ClamaAV heuristics (Google Safe Browsing database, PhishingScanURLs, ...).
 
 `languages`: `(all|([a-z][a-z])+( ([a-z][a-z])+)*)` ('default =' `all`)::
 
 This option is used to specify which languages are considered OK for incoming mail.
 
-`maxspamsize`: `<integer> (64 - N)` ('default =' `204800`)::
+`maxspamsize`: `<integer> (64 - N)` ('default =' `262144`)::
 
 Maximum size of spam messages in bytes.
 
@@ -248,14 +216,6 @@ Allow to view hyperlinks.
 
 Authentication mode to access the quarantine interface. Mode 'ticket' allows login using tickets sent with the daily spam report. Mode 'ldap' requires to login using an LDAP account. Finally, mode 'ldapticket' allows both ways.
 
-`delete`: `<string>` ::
-
-A list of settings you want to delete.
-
-`digest`: `<string>` ::
-
-Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
-
 `hostname`: `<string>` ::
 
 Quarantine Host. Usefule if you run a Cluster and want users to connect to a specific host.
@@ -282,14 +242,6 @@ Allow to view images.
 
 Allow to view hyperlinks.
 
-`delete`: `<string>` ::
-
-A list of settings you want to delete.
-
-`digest`: `<string>` ::
-
-Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
-
 `lifetime`: `<integer> (1 - N)` ('default =' `7`)::
 
 Quarantine life time (days)