Bump to 1.14.1

[platform/upstream/augeas.git] / lenses / dovecot.aug

diff --git a/lenses/dovecot.aug b/lenses/dovecot.aug
index f7afc8f..4a25a83 100644 (file)
--- a/lenses/dovecot.aug
+++ b/lenses/dovecot.aug
@@ -114,7 +114,7 @@ let block_newlines (entry:lens) (comment:lens) =
 Map block enclosed in brackets recursively.
 Block may be indented and have optional argument.
 Block body may have entries, comments, empty lines, and nested blocks recursively. *)
-let rec block = [ indent . key block_names . (Sep.space . Quote.do_dquote_opt (store /[\/A-Za-z0-9_-]+/))? . block_newlines (entry|block|mailbox) comment . eol ]
+let rec block = [ indent . key block_names . (Sep.space . Quote.do_dquote_opt (store /!?[\/A-Za-z0-9_-]+/))? . block_newlines (entry|block|mailbox) comment . eol ]
 
 
 (******************************************************************
@@ -128,6 +128,8 @@ let lns = (comment|empty|entry|command|block)*
 (* Variable: filter *)
 let filter = incl "/etc/dovecot/dovecot.conf"
            . (incl "/etc/dovecot/conf.d/*.conf")
+           . incl "/usr/local/etc/dovecot/dovecot.conf"
+           . (incl "/usr/local/etc/dovecot/conf.d/*.conf")
            . Util.stdexcl
 
 let xfm = transform lns filter