From 0f0239db45cbd40ff79f301bbade2f2dcb005931 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 17 Feb 2019 11:52:12 +0100 Subject: Renaming container-tools to compute-tools. Signed-off-by: Daniel Baumann --- share/doc/HOST-SETUP.txt | 15 +++-- share/doc/asciicast/introduction.sh | 11 ++-- share/doc/examples/buster.cfg | 40 +++++++------ share/doc/examples/engywuck-backports.cfg | 94 +++++++++++++++---------------- 4 files changed, 78 insertions(+), 82 deletions(-) (limited to 'share/doc') diff --git a/share/doc/HOST-SETUP.txt b/share/doc/HOST-SETUP.txt index 8c915ef..d2e4216 100644 --- a/share/doc/HOST-SETUP.txt +++ b/share/doc/HOST-SETUP.txt @@ -1,5 +1,5 @@ -container-tools: Host Setup -=========================== +compute-tools: Host Setup +========================= 1. Debian Packages @@ -187,7 +187,7 @@ Linux supports unprivileged containers with the user namespace. By default the user namespace is disabled on Debian systems (see #898446). To enable user namespace, edit the following file for a permant change: - /etc/sysctl.d/zz-container-tools.conf + /etc/sysctl.d/zz-compute-tools.conf sysctl -p or enable it manually with: @@ -195,7 +195,7 @@ or enable it manually with: echo 1 > /proc/sys/kernel/unprivileged_userns_clone Note that containers need to be started with the correct -configuration in /etc/container-tools/config to run unpriviled +configuration in /etc/compute-tools/container/config to run unpriviled (private-users option). @@ -207,7 +207,6 @@ unprivileged users to manage privileged containers without granting them privileges or accounts, the container-shell can be used together with sudo and a container user. - sudo adduser --gecos "container-tools,,," \ - --home /var/lib/machines/container-tools \ - --shell /usr/bin/container-shell \ - --no-create-home container + sudo adduser --gecos "compute-tools,,," \ + --home /var/lib/open-infrastructure/container-shell \ + --shell /usr/bin/container-shell diff --git a/share/doc/asciicast/introduction.sh b/share/doc/asciicast/introduction.sh index cadfc93..68b02d2 100755 --- a/share/doc/asciicast/introduction.sh +++ b/share/doc/asciicast/introduction.sh @@ -1,6 +1,5 @@ #!/bin/sh -# container-tools - Manage systemd-nspawn containers # Copyright (C) 2014-2019 Daniel Baumann # # SPDX-License-Identifier: GPL-3.0+ @@ -51,7 +50,7 @@ Text () sleep 2 -Text "# Welcome to this container-tools introduction cast." +Text "# Welcome to this compute-tools introduction cast." echo echo @@ -59,7 +58,7 @@ Text "# 1. We're using Debian ($(lsb_release -cs))..." Command "lsb_release -a" -Text "# ...and container-tools version $(cnt version)." +Text "# ...and compute-tools version $(cnt version)." Command "cnt version" @@ -125,13 +124,13 @@ Command "sudo cnt list" echo echo -Text "# This concludes this introduction to container-tools." +Text "# This concludes this introduction to compute-tools." Text "#" Text "# Thanks for watching and have fun setting up" Text "# your own Linux containers based on systemd-nspawn" -Text "# using container-tools from Open Infrastructure:" +Text "# using compute-tools from Open Infrastructure:" Text "#" -Text "# https://open-infrastructure.net/software/container-tools" +Text "# https://open-infrastructure.net/software/compute-tools" sleep 2 diff --git a/share/doc/examples/buster.cfg b/share/doc/examples/buster.cfg index 7ea6fdf..67705b4 100644 --- a/share/doc/examples/buster.cfg +++ b/share/doc/examples/buster.cfg @@ -1,37 +1,35 @@ -# container-tools - Manage systemd-nspawn containers -# # example for automated Debian 10 (buster) based container creation # using: sudo container create -s debian debconf debconf/priority select critical debconf debconf/frontend select Noninteractive -container-tools cnt-debconf/mode select debian +compute-tools cnt-debconf/mode select debian -#container-tools cnt-debconf/preseed-files string -#container-tools cnt-debconf/include-preseed-files string +#compute-tools cnt-debconf/preseed-files string +#compute-tools cnt-debconf/include-preseed-files string -container-tools cnt-debconf/distribution select buster -#container-tools cnt-debconf/parent-distribution select +compute-tools cnt-debconf/distribution select buster +#compute-tools cnt-debconf/parent-distribution select -container-tools cnt-debconf/architecture select auto +compute-tools cnt-debconf/architecture select auto -container-tools cnt-debconf/archives multiselect buster-security, buster-updates -#container-tools cnt-debconf/parent-archives multiselect +compute-tools cnt-debconf/archives multiselect buster-security, buster-updates +#compute-tools cnt-debconf/parent-archives multiselect -container-tools cnt-debconf/mirror string https://deb.debian.org/debian -container-tools cnt-debconf/mirror-security string http://security.debian.org +compute-tools cnt-debconf/mirror string https://deb.debian.org/debian +compute-tools cnt-debconf/mirror-security string http://security.debian.org -#container-tools cnt-debconf/parent-mirror string -#container-tools cnt-debconf/parent-mirror-security string +#compute-tools cnt-debconf/parent-mirror string +#compute-tools cnt-debconf/parent-mirror-security string -container-tools cnt-debconf/archive-areas multiselect main -#container-tools cnt-debconf/parent-archive-areas multiselect +compute-tools cnt-debconf/archive-areas multiselect main +#compute-tools cnt-debconf/parent-archive-areas multiselect -container-tools cnt-debconf/packages string openssh-server +compute-tools cnt-debconf/packages string openssh-server -container-tools cnt-debconf/root-password string debian -#container-tools cnt-debconf/root-password-crypted string +compute-tools cnt-debconf/root-password string debian +#compute-tools cnt-debconf/root-password-crypted string -container-tools cnt-debconf/network1/bridge string bridge0 -#container-tools cnt-debconf/network-mac string +compute-tools cnt-debconf/network1/bridge string bridge0 +#compute-tools cnt-debconf/network-mac string diff --git a/share/doc/examples/engywuck-backports.cfg b/share/doc/examples/engywuck-backports.cfg index d90c935..774e007 100644 --- a/share/doc/examples/engywuck-backports.cfg +++ b/share/doc/examples/engywuck-backports.cfg @@ -4,67 +4,67 @@ debconf debconf/priority select critical debconf debconf/frontend select Noninteractive -container-tools cnt-debconf/mode select progress-linux +compute-tools cnt-debconf/mode select progress-linux -#container-tools cnt-debconf/preseed-files string -#container-tools cnt-debconf/include-preseed-files string +#compute-tools cnt-debconf/preseed-files string +#compute-tools cnt-debconf/include-preseed-files string -container-tools cnt-debconf/distribution select engywuck-backports -#container-tools cnt-debconf/parent-distribution select +compute-tools cnt-debconf/distribution select engywuck-backports +#compute-tools cnt-debconf/parent-distribution select -container-tools cnt-debconf/architecture select auto +compute-tools cnt-debconf/architecture select auto -container-tools cnt-debconf/archives multiselect engywuck-security, engywuck-updates, engywuck-extras, engywuck-backports, engywuck-backports-extras -#container-tools cnt-debconf/parent-archives multiselect +compute-tools cnt-debconf/archives multiselect engywuck-security, engywuck-updates, engywuck-extras, engywuck-backports, engywuck-backports-extras +#compute-tools cnt-debconf/parent-archives multiselect -container-tools cnt-debconf/mirror string https://cdn.deb.progress-linux.org/packages -container-tools cnt-debconf/mirror-security string https://cdn.deb.progress-linux.org/packages +compute-tools cnt-debconf/mirror string https://cdn.deb.progress-linux.org/packages +compute-tools cnt-debconf/mirror-security string https://cdn.deb.progress-linux.org/packages -container-tools cnt-debconf/parent-mirror string https://deb.debian.org/debian -container-tools cnt-debconf/parent-mirror-security string http://security.debian.org +compute-tools cnt-debconf/parent-mirror string https://deb.debian.org/debian +compute-tools cnt-debconf/parent-mirror-security string http://security.debian.org -container-tools cnt-debconf/archive-areas multiselect main, contrib, non-free -container-tools cnt-debconf/parent-archive-areas multiselect main, contrib, non-free +compute-tools cnt-debconf/archive-areas multiselect main, contrib, non-free +compute-tools cnt-debconf/parent-archive-areas multiselect main, contrib, non-free -container-tools cnt-debconf/packages string knot-resolver openssh-server +compute-tools cnt-debconf/packages string knot-resolver openssh-server -container-tools cnt-debconf/root-password string progress -#container-tools cnt-debconf/root-password-crypted string +compute-tools cnt-debconf/root-password string progress +#compute-tools cnt-debconf/root-password-crypted string # Network IP configuration -container-tools cnt-debconf/network1/bridge string bridge0 -container-tools cnt-debconf/network1/veth string veth0 -container-tools cnt-debconf/network1/ipv4-method select static -container-tools cnt-debconf/network1/ipv4-comment string Primary network interfaces -container-tools cnt-debconf/network1/ipv4-address string 192.168.0.2 -container-tools cnt-debconf/network1/ipv4-gateway string 192.168.0.1 -container-tools cnt-debconf/network1/ipv4-netmask string 255.255.255.0 -#container-tools cnt-debconf/network1/ipv4-post-up string -#container-tools cnt-debconf/network1/ipv4-post-down string +compute-tools cnt-debconf/network1/bridge string bridge0 +compute-tools cnt-debconf/network1/veth string veth0 +compute-tools cnt-debconf/network1/ipv4-method select static +compute-tools cnt-debconf/network1/ipv4-comment string Primary network interfaces +compute-tools cnt-debconf/network1/ipv4-address string 192.168.0.2 +compute-tools cnt-debconf/network1/ipv4-gateway string 192.168.0.1 +compute-tools cnt-debconf/network1/ipv4-netmask string 255.255.255.0 +#compute-tools cnt-debconf/network1/ipv4-post-up string +#compute-tools cnt-debconf/network1/ipv4-post-down string # Network DNS configuration -container-tools cnt-debconf/nameserver/server string 127.0.0.1 8.8.8.8 8.8.4.4 -container-tools cnt-debconf/nameserver/domain string example.net -container-tools cnt-debconf/nameserver/search string example.net -container-tools cnt-debconf/nameserver/options string timeout:1 attempts:1 +compute-tools cnt-debconf/nameserver/server string 127.0.0.1 8.8.8.8 8.8.4.4 +compute-tools cnt-debconf/nameserver/domain string example.net +compute-tools cnt-debconf/nameserver/search string example.net +compute-tools cnt-debconf/nameserver/options string timeout:1 attempts:1 # Third-Party Repositories -#container-tools cnt-debconf/archive1/repository string -#container-tools cnt-debconf/archive1/list string -#container-tools cnt-debconf/archive1/comment string -#container-tools cnt-debconf/archive1/source string -#container-tools cnt-debconf/archive1/key string -#container-tools cnt-debconf/archive1/preferences-package string -#container-tools cnt-debconf/archive1/preferences-pin string -#container-tools cnt-debconf/archive1/preferences-pin-priority +#compute-tools cnt-debconf/archive1/repository string +#compute-tools cnt-debconf/archive1/list string +#compute-tools cnt-debconf/archive1/comment string +#compute-tools cnt-debconf/archive1/source string +#compute-tools cnt-debconf/archive1/key string +#compute-tools cnt-debconf/archive1/preferences-package string +#compute-tools cnt-debconf/archive1/preferences-pin string +#compute-tools cnt-debconf/archive1/preferences-pin-priority # Internal Options -#container-tools cnt-debconf/apt-recommends string -#container-tools cnt-debconf/debconf-frontend string -#container-tools cnt-debconf/debconf-priority string -#container-tools cnt-debconf/container-command string -#container-tools cnt-debconf/host-command string -container-tools cnt-debconf/auto string true -#container-tools cnt-debconf/overlay string -#container-tools cnt-debconf/bind string -#container-tools cnt-debconf/bind-ro string +#compute-tools cnt-debconf/apt-recommends string +#compute-tools cnt-debconf/debconf-frontend string +#compute-tools cnt-debconf/debconf-priority string +#compute-tools cnt-debconf/container-command string +#compute-tools cnt-debconf/host-command string +compute-tools cnt-debconf/auto string true +#compute-tools cnt-debconf/overlay string +#compute-tools cnt-debconf/bind string +#compute-tools cnt-debconf/bind-ro string -- cgit v1.2.3