Skip to content

Commit 9fe4df5

Browse files
committed
add manpage for doas.d(5)
1 parent c9ff0fc commit 9fe4df5

File tree

3 files changed

+52
-0
lines changed

3 files changed

+52
-0
lines changed

GNUmakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ install: ${PROG} ${MAN}
2424
chmod ${BINMODE} ${DESTDIR}${BINDIR}/${PROG}
2525
cp -f doas.1 ${DESTDIR}${MANDIR}/man1
2626
cp -f doas.conf.5 ${DESTDIR}${MANDIR}/man5
27+
cp -f doas.d.5 ${DESTDIR}${MANDIR}/man5
2728

2829
uninstall:
2930
rm -f ${DESTDIR}${BINDIR}/${PROG}

doas.conf.5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ permit nopass keepenv setenv { PATH } root as root
143143
.Ed
144144
.Sh SEE ALSO
145145
.Xr doas 1 ,
146+
.Xr doas.d 5 ,
146147
.Xr syslogd 8
147148
.Sh HISTORY
148149
The

doas.d.5

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
.\"Copyright (c) 2021 Ariadne Conill <[email protected]>
2+
.\"
3+
.\"Permission to use, copy, modify, and distribute this software for any
4+
.\"purpose with or without fee is hereby granted, provided that the above
5+
.\"copyright notice and this permission notice appear in all copies.
6+
.\"
7+
.\"THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8+
.\"WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
9+
.\"MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
10+
.\"ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
11+
.\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
12+
.\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
13+
.\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
14+
.Dd $Mdocdate: October 9 2020 $
15+
.Dt DOAS.CONF 5
16+
.Os
17+
.Sh NAME
18+
.Nm doas.conf
19+
.Nd doas configuration file
20+
.Sh DESCRIPTION
21+
The
22+
.Xr doas 1
23+
utility executes commands as other users according to the rules
24+
configured in either the configuration file or, optionally, the
25+
configuration directory. The preference to use the configuration
26+
file or configuration directory is determined at compile time,
27+
.Xr doas 1
28+
will only consult one or the other.
29+
.Pp
30+
Configuration snippets stored in the configuration directory
31+
follow the same rules as the classic
32+
.Xr doas 1
33+
configuration file, documented in
34+
.Xr doas.conf 5 .
35+
They must end with the .conf extension, or they will be ignored.
36+
.Pp
37+
These snippets are read in alphabetical order and thus can be
38+
ordered in the same way as other configuration directories.
39+
.Sh FILES
40+
.Bl -tag -width /etc/doas.d -compact
41+
.It Pa /etc/doas.d
42+
.Xr doas 1
43+
configuration directory.
44+
.Sh SEE ALSO
45+
.Xr doas 1 ,
46+
.Xr doas.conf 5
47+
.Sh HISTORY
48+
The
49+
.Nm
50+
configuration directory first appeared in OpenDoas.

0 commit comments

Comments
 (0)