Merging upstream version 20190222.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

23 files changed, 233 insertions, 162 deletions

diff --git a/share/man/Makefile b/share/man/Makefile
index a069734..4f5b682 100644
--- a/share/man/Makefile
+++ b/share/man/Makefile
@@ -1,7 +1,6 @@
 # Makefile
 
-# container-tools - Manage systemd-nspawn containers
-# Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
diff --git a/share/man/container-tools.7.txt b/share/man/compute-tools.7.txt
index 8195ea4..5a4d6db 100644
--- a/share/man/container-tools.7.txt
+++ b/share/man/compute-tools.7.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,13 +19,13 @@ CONTAINER-TOOLS(7)
 ==================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
 NAME
 ----
-container-tools - Manage systemd-nspawn containers
+compute-tools - Manage systemd-nspawn containers
 
 
 DESCRIPTION
@@ -34,15 +33,15 @@ DESCRIPTION
 "[A Linux container] is an operating-system-level virtualization environment for running multiple isolated Linux systems (containers) on a single Linux control host."::
     -- Wikipedia (https://en.wikipedia.org/wiki/LXC)
 
-container-tools provides the system integration for managing containers using systemd-nspawn.
+compute-tools provides the system integration for managing containers using systemd-nspawn.
 
 
 DOWNLOAD
 --------
-  * Upstream Releases: https://files.open-infrastructure.net/software/container-tools/upstream
-  * Upstream Sources: https://sources.open-infrastructure.net/software/container-tools
-  * Debian Releases: https://files.open-infrastructure.net/software/container-tools/debian
-  * Debian Sources: https://sources.progress-linux.org/users/daniel/debian/packages/open-infrastructure-container-tools
+  * Upstream Releases: https://get.open-infrastructure.net/software/compute-tools/upstream
+  * Upstream Sources: https://git.open-infrastructure.net/software/compute-tools
+  * Debian Releases: https://get.open-infrastructure.net/software/compute-tools/debian
+  * Debian Sources: https://git.progress-linux.org/users/daniel/debian/packages/open-infrastructure-compute-tools
 
 
 INSTALLATION
@@ -51,8 +50,8 @@ INSTALLATION
 SOURCE
 ~~~~~~
   1. sudo apt install asciidoc git docbook-xml docbook-xsl libxml2-utils make xsltproc dbus systemd-container
-  2. git clone https://sources.open-infrastructure.net/software/container-tools
-  3. cd container-tools && sudo make install
+  2. git clone https://git.open-infrastructure.net/software/compute-tools
+  3. cd compute-tools && sudo make install
 
 DEBIAN 9 (STRETCH) AND NEWER
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -77,7 +76,7 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System:
 
 KNOWN LIMITATIONS
 -----------------
-  * This version of container-tools currently do not work with systemd-networkd and depend on ifupdown.
+  * This version of compute-tools currently do not work with systemd-networkd and depend on ifupdown.
   * Using overlay, the upper directory can not be an NFS mount due to limitations in Linux' overlay filesystem,
     see https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/filesystems/overlayfs.txt
 
@@ -99,7 +98,7 @@ USAGE
 *List container on the system:*::
 	sudo container list
 
-*Show container-tools version:*::
+*Show container version:*::
 	container version
 
 See container(1) for a list of all container commands.
@@ -131,4 +130,4 @@ LINKS
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-auto.1.txt b/share/man/container-auto.1.txt
index f1ab951..0d0a633 100644
--- a/share/man/container-auto.1.txt
+++ b/share/man/container-auto.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-START(1)
 ==================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -64,13 +63,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -83,4 +82,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-console.1.txt b/share/man/container-console.1.txt
index 4ea8216..54cf242 100644
--- a/share/man/container-console.1.txt
+++ b/share/man/container-console.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-CONSOLE(1)
 ====================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -58,13 +57,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -77,4 +76,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-curl.1.txt b/share/man/container-create-curl.1.txt
index 6486c9b..40028c9 100644
--- a/share/man/container-create-curl.1.txt
+++ b/share/man/container-create-curl.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-CREATE-CURL(1)
 ========================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -63,7 +62,7 @@ The following script options are available:
 	Specify the root password, defaults to a random 16 character password.
 
 *--server='SERVER'*::
-	Specify the image server to download from, defaults to https://files.open-infrastructure.net/system/container/debian.
+	Specify the image server to download from, defaults to https://get.open-infrastructure.net/system/container/debian.
 
 *--setup='SETUP'*::
 	Specify the setup image name to download, defaults to the value specified through --system using the setup.tar.${COMPRESSION} suffix.
@@ -84,37 +83,37 @@ FILES
 -----
 The following files are used:
 
-*/etc/container-tools/config*::
+*/etc/open-infrastructure/container/config*::
 	Container configuration files.
 
-*/usr/share/container-tools/scripts*::
+*/usr/share/open-infrastructure/container/scripts*::
 	Container creation scripts.
 
-*/usr/share/doc/container-tools*::
+*/usr/share/doc/compute-tools*::
 	Container documentation.
 
 */var/lib/machines*::
 	Container directory.
 
-*/var/cache/container-tools*::
+*/var/cache/open-infrastructure/container*::
 	Container cache directory.
 
 
 CONTAINER IMAGES
 ----------------
 
-container-tools will download tarballs from a server expecting that the images are tarballs with either gzip, lzip, xz, or no compression. See container-images.sh as an example on how to create your own container images.
+compute-tools will download tarballs from a server expecting that the images are tarballs with either gzip, lzip, xz, or no compression. See container-images.sh as an example on how to create your own container images.
 
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -127,4 +126,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index a86d964..e6f2582 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-CREATE-DEBOOTSTRAP(1)
 ===============================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -113,34 +112,34 @@ FILES
 -----
 The following files are used:
 
-*/etc/container-tools/config*::
+*/etc/open-infrastructure/container/config*::
 	Container configuration files.
 
-*/usr/share/container-tools/scripts*::
+*/usr/share/open-infrastructure/container/scripts*::
 	Container creation scripts.
 
-*/usr/share/doc/container-tools*::
+*/usr/share/doc/compute-tools*::
 	Container documentation.
 
 */var/lib/machines*::
 	Container directory.
 
-*/var/cache/container-tools*::
+*/var/cache/open-infrastructure/container*::
 	Container cache directory.
 
-*/tmp/container-tools*::
+*/tmp/compute-tools*::
 	Container temporary directory.
 
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -153,4 +152,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
index da578bd..fc8651e 100644
--- a/share/man/container-create-debootstrap.1.txt
+++ b/share/man/container-create-debootstrap.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-CREATE-DEBOOTSTRAP(1)
 ===============================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -76,13 +75,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -95,4 +94,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-create.1.txt b/share/man/container-create.1.txt
index 4e88175..d36a694 100644
--- a/share/man/container-create.1.txt
+++ b/share/man/container-create.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-CREATE(1)
 ===================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -82,7 +81,7 @@ The following container scripts are available:
 	Advanced script to automatically create Debian based container, see container-create-debconf(1).
 
 *default*::
-	Symlink (if existing) to a container script which is used if no script was specified. On Debian based system this can be managed through update-alternatives(1), i.e. 'sudo update-alternatives --config container-tools_script'.
+	Symlink (if existing) to a container script which is used if no script was specified. On Debian based system this can be managed through update-alternatives(1), i.e. 'sudo update-alternatives --config container_script'.
 
 
 EXAMPLES
@@ -101,13 +100,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -120,4 +119,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-enter.1.txt b/share/man/container-enter.1.txt
index 5051d74..aaf14de 100644
--- a/share/man/container-enter.1.txt
+++ b/share/man/container-enter.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-CONSOLE(1)
 ====================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -58,13 +57,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -77,4 +76,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-key.1.txt b/share/man/container-key.1.txt
index 448bd56..7e7f376 100644
--- a/share/man/container-key.1.txt
+++ b/share/man/container-key.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-KEY(1)
 ================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -65,13 +64,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -84,4 +83,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-limit.1.txt b/share/man/container-limit.1.txt
index a36328a..62f0288 100644
--- a/share/man/container-limit.1.txt
+++ b/share/man/container-limit.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-LIMIT(1)
 ==================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -88,13 +87,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -107,4 +106,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-list.1.txt b/share/man/container-list.1.txt
index 8a018b0..1916a6b 100644
--- a/share/man/container-list.1.txt
+++ b/share/man/container-list.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-LIST(1)
 =================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -105,13 +104,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -124,4 +123,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-log.1.txt b/share/man/container-log.1.txt
new file mode 100644
index 0000000..ea5ab91
--- /dev/null
+++ b/share/man/container-log.1.txt
@@ -0,0 +1,90 @@
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+//
+// SPDX-License-Identifier: GPL-3.0+
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+CONTAINER-LOG(1)
+================
+:doctype: manpage
+:man manual: Open Infrastructure
+:man source: compute-tools
+:man version: {revnumber}
+
+
+NAME
+----
+container-log - Show container log
+
+
+SYNOPSIS
+--------
+*container log* ['OPTIONS']
+
+
+DESCRIPTION
+-----------
+The container log command shows the container log.
+
+
+OPTIONS
+-------
+The following container options are available:
+
+*-d, --date*::
+	Show only log entries of the specified date as 'YYYY-MM-DD' or a date range like 'today-7'.
+
+*-n, --name*::
+	Show only log entries for the specified container.
+
+EXAMPLES
+--------
+*Show all log entries:*::
+	sudo container log
+
+*Show only log entries of today:*::
+	sudo container log -d today
+
+*Show only log entries of yesterday:*::
+	sudo container log -d yesterday
+
+*Show all log entries of the example.net container:*::
+	sudo container log -n example.net
+
+*Show only log entries of the example.net container of the last 30 days:*::
+	sudo container log -d today-30 -n example.net
+
+
+SEE ALSO
+--------
+compute-tools(7),
+container(1).
+
+
+HOMEPAGE
+--------
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+
+
+CONTACT
+-------
+Bug reports, feature requests, help, patches, support and everything else
+are welcome on the Open Infrastructure Software Mailing List <software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System at https://bugs.debian.org.
+
+
+AUTHORS
+-------
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-move.1.txt b/share/man/container-move.1.txt
index 172bd67..2320dfb 100644
--- a/share/man/container-move.1.txt
+++ b/share/man/container-move.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-REMOVE(1)
 ===================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -66,13 +65,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -85,4 +84,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-remove.1.txt b/share/man/container-remove.1.txt
index 94d167b..b3fb1f7 100644
--- a/share/man/container-remove.1.txt
+++ b/share/man/container-remove.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-REMOVE(1)
 ===================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -75,13 +74,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -94,4 +93,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-restart.1.txt b/share/man/container-restart.1.txt
index 99b461d..f3780b6 100644
--- a/share/man/container-restart.1.txt
+++ b/share/man/container-restart.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-RESTART(1)
 ====================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -58,13 +57,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -77,4 +76,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-shell.1.txt b/share/man/container-shell.1.txt
index bd0f4e1..0fd1aa9 100644
--- a/share/man/container-shell.1.txt
+++ b/share/man/container-shell.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER(1)
 ============
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -36,7 +35,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-container-tools provides the system integration for managing containers using systemd-nspawn.
+compute-tools provides the system integration for managing containers using systemd-nspawn.
 
 
 COMMANDS
@@ -63,13 +62,13 @@ needing a regular shell login on the container server.
 
 For usage over SSH a unprivileged user should be created:
 
-  sudo adduser --gecos "container-tools,,," \
-	--home /var/lib/container-tools/container-shell \
+  sudo adduser --gecos "compute-tools,,," \
+	--home /var/lib/open-infrastructure/container-shell \
 	--shell /usr/bin/container-shell
 
-The container-shell can then be allowed for specific SSH keys via /var/ib/container-tools/container-shell/.ssh/authorized_keys like so:
+The container-shell can then be allowed for specific SSH keys via /var/lib/open-infrastructure/container-shell/.ssh/authorized_keys like so:
 
-  command="/usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa [...]
+  command="/usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-ed25519 [...]
 
 
 RESTRICTED SHELL
@@ -84,7 +83,7 @@ Example (blacklisting): In order to allow all commands except for removing and s
 
   command="CONTAINER_COMMANDS_DISABLE='remove stop' /usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa [...]
 
-Example (whitelisting): The other way around works too. To disallow all commands except for listing containers and showing the container-tools version, the following variable can be used:
+Example (whitelisting): The other way around works too. To disallow all commands except for listing containers and showing the compute-tools version, the following variable can be used:
 
   command="CONTAINER_COMMANDS_ENABLE='list version' /usr/bin/container-shell",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa [...]
 
@@ -97,7 +96,7 @@ systemd-nspawn(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -110,4 +109,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-start.1.txt b/share/man/container-start.1.txt
index ae4ff89..544d155 100644
--- a/share/man/container-start.1.txt
+++ b/share/man/container-start.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-START(1)
 ==================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -61,13 +60,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -80,4 +79,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-status.1.txt b/share/man/container-status.1.txt
index b403769..d4d06a9 100644
--- a/share/man/container-status.1.txt
+++ b/share/man/container-status.1.txt
@@ -1,4 +1,3 @@
-// container-tools - Manage systemd-nspawn containers
 // Copyright (C) 2016 Simon Spöehel <simon.spoehel@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
@@ -20,7 +19,7 @@ CONTAINER-STATUS(1)
 ===================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -55,13 +54,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -74,4 +73,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-stop.1.txt b/share/man/container-stop.1.txt
index ec169d8..62cfcd3 100644
--- a/share/man/container-stop.1.txt
+++ b/share/man/container-stop.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-STOP(1)
 =================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -64,13 +63,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -83,4 +82,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-top.1.txt b/share/man/container-top.1.txt
index 2f99c5b..b603557 100644
--- a/share/man/container-top.1.txt
+++ b/share/man/container-top.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER-TOP(1)
 ================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -55,13 +54,13 @@ EXAMPLES
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -74,4 +73,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container-version.1.txt b/share/man/container-version.1.txt
index 19a1138..d774401 100644
--- a/share/man/container-version.1.txt
+++ b/share/man/container-version.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,13 +19,13 @@ CONTAINER-VERSION(1)
 ====================
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
 NAME
 ----
-container-version - Show container-tools version
+container-version - Show container version
 
 
 SYNOPSIS
@@ -38,7 +37,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-The container version command shows the container-tools version number.
+The container version command shows the container version number.
 
 
 OPTIONS
@@ -48,19 +47,19 @@ This command has no options.
 
 EXAMPLES
 --------
-*Show container-tools version:*::
+*Show container version:*::
 	container version
 
 
 SEE ALSO
 --------
-container-tools(7),
+compute-tools(7),
 container(1).
 
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -73,4 +72,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container.1.txt b/share/man/container.1.txt
index 0473958..aba9141 100644
--- a/share/man/container.1.txt
+++ b/share/man/container.1.txt
@@ -1,5 +1,4 @@
-// container-tools - Manage systemd-nspawn containers
-// Copyright (C) 2014-2018 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+// Copyright (C) 2014-2019 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 //
 // SPDX-License-Identifier: GPL-3.0+
 //
@@ -20,7 +19,7 @@ CONTAINER(1)
 ============
 :doctype: manpage
 :man manual: Open Infrastructure
-:man source: container-tools
+:man source: compute-tools
 :man version: {revnumber}
 
 
@@ -37,7 +36,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-container-tools provides the system integration for managing containers using systemd-nspawn.
+compute-tools provides the system integration for managing containers using systemd-nspawn.
 
 
 OPTIONS
@@ -85,6 +84,9 @@ The following container commands are available:
 *list*::
 	List container on the system, see container-list(1).
 
+*log*::
+	Show container log, see container-log(1).
+
 *status*::
 	Show container status, see container-status(1).
 
@@ -92,14 +94,14 @@ The following container commands are available:
 	Dynamic list of container on the system, see container-top(1).
 
 *version*::
-	Show container-tools version, see container-version(1).
+	Show container version, see container-version(1).
 
 
 FILES
 -----
 The following files are used:
 
-*/etc/container-tools*::
+*/etc/open-infrastructure/container*::
 	Container configuration files.
 
 */usr/bin/container*, */usr/bin/cnt*::
@@ -108,22 +110,22 @@ The following files are used:
 */usr/bin/container-shell*, */usr/bin/cntsh*::
 	Container shell program.
 
-*/usr/lib/container-tools*::
+*/usr/lib/open-infrastructure/container*::
 	Container commands.
 
-*/usr/share/container-tools*::
+*/usr/share/open-infrastructure/container*::
 	Container shared data.
 
-*/usr/share/doc/container-tools*::
+*/usr/share/doc/compute-tools*::
 	Container documentation files.
 
-*/var/cache/container-tools*::
+*/var/cache/open-infrastructure/container*::
 	Container cache directory.
 
 */var/lib/machines*::
 	Container root directory.
 
-*/var/log/container-tools*::
+*/var/log/open-infrastructure*::
 	Container log files.
 
 
@@ -135,7 +137,7 @@ systemd-nspawn(1).
 
 HOMEPAGE
 --------
-More information about container-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
+More information about compute-tools and the Open Infrastructure project can be found on the homepage at https://open-infrastructure.net.
 
 
 CONTACT
@@ -148,4 +150,4 @@ Debian specific bugs can also be reported in the Debian Bug Tracking System at h
 
 AUTHORS
 -------
-container-tools was written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.
+compute-tools were written by Daniel Baumann <daniel.baumann@open-infrastructure.net> and others.