Compare commits
4 Commits
RELEASE_3_
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
b418a79584 | ||
|
f4868e803d | ||
|
75a0fe2cab | ||
|
593ce8e223 |
2
Makefile
2
Makefile
@ -9,10 +9,10 @@ all:
|
|||||||
|
|
||||||
install:
|
install:
|
||||||
mkdir -p ${DST}/etc/ezjail/ ${DST}/man/man5/ ${DST}/man/man7 ${DST}/man/man8 ${DST}/etc/rc.d/ ${DST}/bin/ ${DST}/share/examples/ezjail ${DST}/share/zsh/site-functions
|
mkdir -p ${DST}/etc/ezjail/ ${DST}/man/man5/ ${DST}/man/man7 ${DST}/man/man8 ${DST}/etc/rc.d/ ${DST}/bin/ ${DST}/share/examples/ezjail ${DST}/share/zsh/site-functions
|
||||||
cp ezjail.conf.sample ${DST}/etc/
|
|
||||||
cp -R examples/example ${DST}/share/examples/ezjail/
|
cp -R examples/example ${DST}/share/examples/ezjail/
|
||||||
cp -R examples/nullmailer-example ${DST}/share/examples/ezjail/
|
cp -R examples/nullmailer-example ${DST}/share/examples/ezjail/
|
||||||
cp -R share/zsh/site-functions/ ${DST}/share/zsh/site-functions/
|
cp -R share/zsh/site-functions/ ${DST}/share/zsh/site-functions/
|
||||||
|
sed s:EZJAIL_PREFIX:${PREFIX}: ezjail.conf.sample > ${DST}/etc/ezjail.conf.sample
|
||||||
sed s:EZJAIL_PREFIX:${PREFIX}: ezjail.sh > ${DST}/etc/rc.d/ezjail
|
sed s:EZJAIL_PREFIX:${PREFIX}: ezjail.sh > ${DST}/etc/rc.d/ezjail
|
||||||
sed s:EZJAIL_PREFIX:${PREFIX}: ezjail-admin > ${DST}/bin/ezjail-admin
|
sed s:EZJAIL_PREFIX:${PREFIX}: ezjail-admin > ${DST}/bin/ezjail-admin
|
||||||
sed s:EZJAIL_PREFIX:${PREFIX}: man8/ezjail-admin.8 > ${DST}/man/man8/ezjail-admin.8
|
sed s:EZJAIL_PREFIX:${PREFIX}: man8/ezjail-admin.8 > ${DST}/man/man8/ezjail-admin.8
|
||||||
|
@ -463,7 +463,7 @@ filteroldsnapshots() {
|
|||||||
case ${win} in [0-9]);; [0-9]*[0-9mhdwy]);; *) echo "Unknown window length declaration ${win}"; return ;; esac
|
case ${win} in [0-9]);; [0-9]*[0-9mhdwy]);; *) echo "Unknown window length declaration ${win}"; return ;; esac
|
||||||
|
|
||||||
# values default to minutes
|
# values default to minutes
|
||||||
case ${win} in *h) m=60;; *d) m=1440;; *w) m=10080;; *y) m=*525600;; *) m=1;; esac
|
case ${win} in *h) m=60;; *d) m=1440;; *w) m=10080;; *y) m=525600;; *) m=1;; esac
|
||||||
win=$((${win%[mhdwy]}*m*60))
|
win=$((${win%[mhdwy]}*m*60))
|
||||||
|
|
||||||
# innerloop $repeats over windows
|
# innerloop $repeats over windows
|
||||||
|
@ -94,7 +94,7 @@ Controls whether
|
|||||||
.Pa /etc/fstab. Ar hostname
|
.Pa /etc/fstab. Ar hostname
|
||||||
should be executed at jail startup time.
|
should be executed at jail startup time.
|
||||||
.br
|
.br
|
||||||
Default:
|
Default:
|
||||||
.Em YES .
|
.Em YES .
|
||||||
.It ezjail_devfs_enable (bool)
|
.It ezjail_devfs_enable (bool)
|
||||||
Controls whether newly created jails are given a working
|
Controls whether newly created jails are given a working
|
||||||
|
@ -221,7 +221,7 @@ that specifies whether the filesystems in
|
|||||||
are carried out. Set by ezjail to
|
are carried out. Set by ezjail to
|
||||||
.Dq Li YES ,
|
.Dq Li YES ,
|
||||||
set to
|
set to
|
||||||
.Qd Li NO
|
.Dq Li NO
|
||||||
at your own risk.
|
at your own risk.
|
||||||
.It jail_JAILNAME_devfs_enable
|
.It jail_JAILNAME_devfs_enable
|
||||||
A boolean specifying whether to mount a
|
A boolean specifying whether to mount a
|
||||||
@ -262,7 +262,7 @@ The parameters to pass to the tool used to decrypt file-based,
|
|||||||
encrypted jails. Initialized from the
|
encrypted jails. Initialized from the
|
||||||
.Fl C
|
.Fl C
|
||||||
option when creating such a jail, or the empty string.
|
option when creating such a jail, or the empty string.
|
||||||
.Ir ezjail_JAILNAME_attachblocking
|
.It ezjail_JAILNAME_attachblocking
|
||||||
.Dq Li YES
|
.Dq Li YES
|
||||||
if the jail requires interaction with the administrator when starting
|
if the jail requires interaction with the administrator when starting
|
||||||
(typically, encrypted jails that needs a password to be decrypted).
|
(typically, encrypted jails that needs a password to be decrypted).
|
||||||
@ -327,7 +327,7 @@ addition, the jail is configured so that on its first boot, the file
|
|||||||
.Pa ezjail.flavour
|
.Pa ezjail.flavour
|
||||||
is executed.
|
is executed.
|
||||||
.Pp
|
.Pp
|
||||||
As part of the install sub-command, the flavour base directory
|
As part of the install sub-command, the flavour base directory
|
||||||
was created as
|
was created as
|
||||||
.Pa /usr/jails/flavours
|
.Pa /usr/jails/flavours
|
||||||
and populated with an single flavour named
|
and populated with an single flavour named
|
||||||
@ -524,7 +524,7 @@ will be asked for the release to install. Neither the man pages nor
|
|||||||
the source nor the ports tree are installed. Note that the FreeBSD FTP
|
the source nor the ports tree are installed. Note that the FreeBSD FTP
|
||||||
server is sometimes so busy the download times out. Use the
|
server is sometimes so busy the download times out. Use the
|
||||||
.Fl h Ar host
|
.Fl h Ar host
|
||||||
option to specify a less loaded server, or the
|
option to specify a less loaded server, or the
|
||||||
.Dq Li $ezjail_ftphost
|
.Dq Li $ezjail_ftphost
|
||||||
option in
|
option in
|
||||||
.Xr ezjail.conf 8 .
|
.Xr ezjail.conf 8 .
|
||||||
@ -580,7 +580,7 @@ macdef getdir
|
|||||||
mreget $i/*
|
mreget $i/*
|
||||||
.Ed
|
.Ed
|
||||||
.Pp
|
.Pp
|
||||||
Then issue this command on the command line. If the FTP download
|
Then issue this command on the command line. If the FTP download
|
||||||
times out re-issue the FTP command again to resume where it left off.
|
times out re-issue the FTP command again to resume where it left off.
|
||||||
.Bd -literal -offset indent
|
.Bd -literal -offset indent
|
||||||
mkdir /usr/8.0-RELEASE
|
mkdir /usr/8.0-RELEASE
|
||||||
@ -697,7 +697,7 @@ address 10.0.10.6 as an alias on the device em1 before starting the jail.
|
|||||||
Interesting additional tools include:
|
Interesting additional tools include:
|
||||||
.Dq Li ports-mgmt/jailaudit .
|
.Dq Li ports-mgmt/jailaudit .
|
||||||
.Sh AUTHOR
|
.Sh AUTHOR
|
||||||
.An Dirk Engling
|
.An Dirk Engling
|
||||||
.Aq erdgeist@erdgeist.org .
|
.Aq erdgeist@erdgeist.org .
|
||||||
.Pp
|
.Pp
|
||||||
The man page is based on a draft by
|
The man page is based on a draft by
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
.Os FreeBSD
|
.Os FreeBSD
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
.Nm ezjail-admin
|
.Nm ezjail-admin
|
||||||
.Nd Administrate ezjail environment
|
.Nd Administrate ezjail environment
|
||||||
.Sh SYNOPSIS
|
.Sh SYNOPSIS
|
||||||
.Nm Cm install
|
.Nm Cm install
|
||||||
.Op Fl mMpPsS
|
.Op Fl mMpPsS
|
||||||
@ -115,7 +115,7 @@ utility to fetch and extract a FreeBSD ports tree from
|
|||||||
.Pa make.conf
|
.Pa make.conf
|
||||||
containing reasonable values to function in the jailed environment is added to
|
containing reasonable values to function in the jailed environment is added to
|
||||||
the new jail template so all jails created from the new jail template will
|
the new jail template so all jails created from the new jail template will
|
||||||
have a working ports environment. See the appendix
|
have a working ports environment. See the appendix
|
||||||
.%B Using Portsnap
|
.%B Using Portsnap
|
||||||
in the
|
in the
|
||||||
.%B FreeBSD Handbook
|
.%B FreeBSD Handbook
|
||||||
@ -130,7 +130,7 @@ default host
|
|||||||
is used. Variable:
|
is used. Variable:
|
||||||
.Dq Li $ezjail_ftphost .
|
.Dq Li $ezjail_ftphost .
|
||||||
.Pp
|
.Pp
|
||||||
It is possible to install from the
|
It is possible to install from the
|
||||||
.Li disc1
|
.Li disc1
|
||||||
CD-ROM, or an extracted -RELEASE directory, by specifying the
|
CD-ROM, or an extracted -RELEASE directory, by specifying the
|
||||||
.Ar host
|
.Ar host
|
||||||
@ -157,7 +157,7 @@ by default. Jailname and IP address are mandatory parameters.
|
|||||||
.Pp
|
.Pp
|
||||||
When a new jail is created, a corresponding new
|
When a new jail is created, a corresponding new
|
||||||
.Pa /etc/fstab. Ns Ar jailname
|
.Pa /etc/fstab. Ns Ar jailname
|
||||||
file is also created, with a
|
file is also created, with a
|
||||||
.Xr nullfs 5
|
.Xr nullfs 5
|
||||||
mount giving access to the base jail from the new jail.
|
mount giving access to the base jail from the new jail.
|
||||||
.Pp
|
.Pp
|
||||||
@ -342,7 +342,7 @@ interactively enter a passphrase. The jail is then not automatically started
|
|||||||
at boot time.
|
at boot time.
|
||||||
.El
|
.El
|
||||||
.Ss Nm Cm console
|
.Ss Nm Cm console
|
||||||
Attach your console to the selected jail. You are logged in as root by
|
Attach your console to the selected jail. You are logged in as root by
|
||||||
default.
|
default.
|
||||||
.Pp
|
.Pp
|
||||||
The following options are available:
|
The following options are available:
|
||||||
@ -396,7 +396,6 @@ means that the jail is not automatically started.
|
|||||||
.Pp
|
.Pp
|
||||||
The following columns are the JID (when it is running), the IP addresses, the name and the full path directory name of the jail.
|
The following columns are the JID (when it is running), the IP addresses, the name and the full path directory name of the jail.
|
||||||
.Ss Nm Cm start | restart | stop | startcrypto | stopcrypto Op Ar jailname ...
|
.Ss Nm Cm start | restart | stop | startcrypto | stopcrypto Op Ar jailname ...
|
||||||
.Pp
|
|
||||||
This is a shortcut to the
|
This is a shortcut to the
|
||||||
.Xr rc 8
|
.Xr rc 8
|
||||||
.Cm ezjail
|
.Cm ezjail
|
||||||
@ -410,7 +409,7 @@ Note that, if ezjail is not enabled in
|
|||||||
.Xr rc.conf 5
|
.Xr rc.conf 5
|
||||||
with
|
with
|
||||||
.Dq Li ezjail_enable= Ns Qq Li YES ,
|
.Dq Li ezjail_enable= Ns Qq Li YES ,
|
||||||
nothing happens.
|
nothing happens.
|
||||||
.Pp
|
.Pp
|
||||||
Since starting crypto image jails requires interaction with the administrator, they are not run at
|
Since starting crypto image jails requires interaction with the administrator, they are not run at
|
||||||
boot time. Use
|
boot time. Use
|
||||||
@ -424,7 +423,7 @@ The following options are available:
|
|||||||
.Bl -tag -width indent
|
.Bl -tag -width indent
|
||||||
.It Fl r Cm run | norun | test
|
.It Fl r Cm run | norun | test
|
||||||
Set the jail to be automatically started or not on boot.
|
Set the jail to be automatically started or not on boot.
|
||||||
|
.sp
|
||||||
Note that the test parameter can be used to check if an ezjail exists, in this case the script will return with an exit code of zero and the runnable state on standard out. A non-zero exit code will be returned if the jail does not exist.
|
Note that the test parameter can be used to check if an ezjail exists, in this case the script will return with an exit code of zero and the runnable state on standard out. A non-zero exit code will be returned if the jail does not exist.
|
||||||
.It Fl n Ar newname
|
.It Fl n Ar newname
|
||||||
Rename the jail. Unless a custom root directory was given with the
|
Rename the jail. Unless a custom root directory was given with the
|
||||||
@ -456,7 +455,6 @@ the selected jail as well as
|
|||||||
The
|
The
|
||||||
.Pa /usr/jails/ Ns Ar jailname
|
.Pa /usr/jails/ Ns Ar jailname
|
||||||
directory is not deleted.
|
directory is not deleted.
|
||||||
.Pp
|
|
||||||
.Bl -tag -width indent
|
.Bl -tag -width indent
|
||||||
.It Fl f
|
.It Fl f
|
||||||
Stop the jail before deleting it.
|
Stop the jail before deleting it.
|
||||||
@ -534,9 +532,9 @@ You can set (and override in that order) the retention policy globally in your
|
|||||||
.Dq Li $ezjail_default_retention_policy
|
.Dq Li $ezjail_default_retention_policy
|
||||||
.Xr ezjail.conf 5
|
.Xr ezjail.conf 5
|
||||||
variable, set them per jail in its config file with their
|
variable, set them per jail in its config file with their
|
||||||
.Dq Li $ezjail_retention_policy
|
.Dq Li $ezjail_retention_policy
|
||||||
variable or set a User property with the name
|
variable or set a User property with the name
|
||||||
.Dq Li ezjail:autosnap_retention
|
.Dq Li ezjail:autosnap_retention
|
||||||
on the respective file systems.
|
on the respective file systems.
|
||||||
.Pp
|
.Pp
|
||||||
The policy is described by a pattern of space separated
|
The policy is described by a pattern of space separated
|
||||||
@ -557,7 +555,7 @@ Exactly one of the following operand must be specified:
|
|||||||
.It Fl b
|
.It Fl b
|
||||||
Build a world from source and install it as the (updated) basejail.
|
Build a world from source and install it as the (updated) basejail.
|
||||||
.Dq make buildworld ; make installworld
|
.Dq make buildworld ; make installworld
|
||||||
by default using the sources located at
|
by default using the sources located at
|
||||||
.Pa /usr/src
|
.Pa /usr/src
|
||||||
(but see the
|
(but see the
|
||||||
.Fl s
|
.Fl s
|
||||||
@ -574,7 +572,7 @@ recommended to update the basejail along with the host system.
|
|||||||
.It Fl u
|
.It Fl u
|
||||||
Use
|
Use
|
||||||
.Xr freebsd-update 8
|
.Xr freebsd-update 8
|
||||||
to update the basejail. Note that as
|
to update the basejail. Note that as
|
||||||
.Xr freebsd-update 8
|
.Xr freebsd-update 8
|
||||||
uses
|
uses
|
||||||
.Dq Li uname -r
|
.Dq Li uname -r
|
||||||
@ -649,7 +647,7 @@ filesystem is taken first.
|
|||||||
.Xr procfs 5 ,
|
.Xr procfs 5 ,
|
||||||
.Xr portsnap 8 .
|
.Xr portsnap 8 .
|
||||||
.Sh AUTHOR
|
.Sh AUTHOR
|
||||||
.An Dirk Engling
|
.An Dirk Engling
|
||||||
.Aq erdgeist@erdgeist.org .
|
.Aq erdgeist@erdgeist.org .
|
||||||
.Pp
|
.Pp
|
||||||
The man page is based on a draft by
|
The man page is based on a draft by
|
||||||
|
Loading…
x
Reference in New Issue
Block a user