aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Gritton <jamie@FreeBSD.org>2023-09-05 20:35:54 +0000
committerJamie Gritton <jamie@FreeBSD.org>2023-09-09 16:57:33 +0000
commit402d5960cb82eaccc33177aac821dbad1b42db1c (patch)
tree10d7ccc3007ad7ed0121df7f41978552191d22f1
parentd0a5da5c1cf9c8d2c19b267e4db0fa2e28838f9d (diff)
downloadsrc-402d5960cb82eaccc33177aac821dbad1b42db1c.tar.gz
src-402d5960cb82eaccc33177aac821dbad1b42db1c.zip
MFC jail.conf(5): Fix and expand description of ".include".
Escape a period that caused a line not to be includesd. Also mention that glob(3) patterns may be included, and a consequence of that. PR: 273561 Reported by: crest@rlwinm.de Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41723 (cherry picked from commit 165234d5527440b7755b01554ff7633e33c0d285)
-rw-r--r--usr.sbin/jail/jail.conf.519
1 files changed, 15 insertions, 4 deletions
diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5
index 33a66c85e7ea..0b82a972020c 100644
--- a/usr.sbin/jail/jail.conf.5
+++ b/usr.sbin/jail/jail.conf.5
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd Jun 3, 2023
+.Dd September 5, 2023
.Dt JAIL.CONF 5
.Os
.Sh NAME
@@ -164,11 +164,22 @@ and
.Ss Includes
A line of the form
.Bd -literal -offset ident
-.include "filename";
+\&.include "filename";
.Ed
.Pp
-will include another file in the configuration. The filename must be
-a literal string, and cannot contain variable expansions.
+will include another file (or files) in the configuration.
+The filename should be either absolute, or relative to the
+configuration file's directory. It cannot contain variable
+expansions, but may contain
+.Xr glob 3
+patterns.
+.Pp
+The included file must exist, though a filename glob may match zero or
+more files. This allows inclusion of any/all files in a directory,
+such as
+.Dq /etc/jail.conf.d/*.conf ,
+or conditional inclusion of a single file, such as
+.Dq jail.foo[.]conf .
.Ss Comments
The configuration file may contain comments in the common C, C++, and
shell formats: