# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1669711296 -3600
# Node ID db04f195db3267b512fa078f4641a52ae5598bea
# Parent  a60fb7a719b398e180677874e0f87485a9b7b583
Man pages for fjail-configure and fjail-hostid

diff -r a60fb7a719b3 -r db04f195db32 docs/conf.py
--- a/docs/conf.py	Mon Nov 28 22:53:54 2022 +0100
+++ b/docs/conf.py	Tue Nov 29 09:41:36 2022 +0100
@@ -74,9 +74,10 @@
     ("man/man8/local-bsdtools", "local-bsdtools", 'FreeBSD administration helper tools v%s' % release, [author], 8),
     ("man/man8/bsmtp2dma", "bsmtp2dma", "Bacula compatible mail submission program", [author], 8),
     ("man/man8/fjail", "fjail", "Management of jails", [author], 8),
+    ("man/man8/fjail-configure", "fjail-configure", "Basic configuration of jails", [author], 8),
     #("man/man8/fjail-copy", "fjail-copy", "Recursively copy ZFS datasets including all properties", [author], 8),
     #("man/man8/fjail-datasets", "fjail-datasets", "Create a new tree of ZFS datasets that will encompass a jail", [author], 8),
-    #("man/man8/fjail-hostid", "fjail-hostid", "Compute a proposal for a new BSD Host UUID and ID", [author], 8),
+    ("man/man8/fjail-hostid", "fjail-hostid", "Generate a proposal for a new BSD Host UUID and ID", [author], 8),
     #("man/man8/fjail-mount", "fjail-mount", "Recursively mount a ZFS dataset and its children", [author], 8),
     #("man/man8/fjail-populate", "fjail-populate", "Populate a directory with content from a FreeBSD base.txz", [author], 8),
     #("man/man8/fjail-privs", "fjail-privs", "Adjust some privileges within a mounted jail", [author], 8),
diff -r a60fb7a719b3 -r db04f195db32 docs/man/man8/fjail-configure.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/man/man8/fjail-configure.rst	Tue Nov 29 09:41:36 2022 +0100
@@ -0,0 +1,50 @@
+.. -*- coding: utf-8; indent-tabs-mode: nil; -*-
+
+fjail-configure
+===============
+
+Synopsis
+--------
+
+**fjail configure** `mountpoint`
+
+
+Description
+-----------
+
+Configure some basic settings of a jail that is mounted at `mountpoint`.
+
+The "root" account within the jail is deactivated.
+
+In the jail's :file:`/etc/rc.conf`::
+
+  sendmail_enable="NONE"
+  clear_tmp_enable="YES"
+  clear_tmp_X="NO"
+  syslogd_flags="-ss"
+  bsdstats_enable="NO"
+
+The timezone is set to "Europe/Berlin" if not yet set.
+
+The :file:`/etc/resolv.conf` is copied from the host into the jail if
+the target does not exist yet.
+
+:command:`/usr/bin/newaliases` is called within the jail.
+
+In the jail's :file:`/etc/periodic.conf.local`::
+
+  daily_ntpd_leapfile_enable="NO"
+  daily_status_zfs_zpool_list_enable="NO"
+  daily_status_disks_enable="NO"
+  daily_status_uptime_enable="NO"
+
+Can be used for all sort of jails (normal, thin).
+
+A proposal for a hostid suitable for use within the jail is printed to
+stdout also; this is done by calling :command:`fjail hostid`.
+
+
+See Also
+--------
+
+:manpage:`fjail(8)`, :manpage:`ftjail(8)`, :manpage:`fjail-hostid(8)`
diff -r a60fb7a719b3 -r db04f195db32 docs/man/man8/fjail-hostid.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/man/man8/fjail-hostid.rst	Tue Nov 29 09:41:36 2022 +0100
@@ -0,0 +1,35 @@
+.. -*- coding: utf-8; indent-tabs-mode: nil; -*-
+
+fjail-hostid
+============
+
+Synopsis
+--------
+
+**fjail hostid**
+
+
+Description
+-----------
+
+Generate a proposal for a new BSD host UUID and ID and print it to stdout.
+
+The output is suitable for inclusion in a :file:`/etc/jail.conf`.
+
+
+Examples
+--------
+
+::
+
+   # fjail hostid
+   Proposed hostuuid/hostid:
+     host.hostuuid = "868be13d-6fc0-11ed-827f-74d435fd3892";
+     host.hostid = 582606249;
+   #
+
+
+See Also
+--------
+
+:manpage:`fjail(8)`, :manpage:`ftjail(8)`
diff -r a60fb7a719b3 -r db04f195db32 pkg-plist
--- a/pkg-plist	Mon Nov 28 22:53:54 2022 +0100
+++ b/pkg-plist	Tue Nov 29 09:41:36 2022 +0100
@@ -9,6 +9,8 @@
 %%DOCS%%man/man8/local-bsdtools.8.gz
 %%DOCS%%man/man8/bsmtp2dma.8.gz
 %%DOCS%%man/man8/fjail.8.gz
+%%DOCS%%man/man8/fjail-configure.8.gz
+%%DOCS%%man/man8/fjail-hostid.8.gz
 %%DOCS%%man/man8/fpkg.8.gz
 %%DOCS%%man/man8/ftjail.8.gz
 %%DOCS%%man/man8/ftjail-build-etcupdate-current-tmpl.8.gz