From nobody Tue Jun 17 08:00:34 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bLznZ4JF6z5q30x; Tue, 17 Jun 2025 08:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bLznZ3kc4z3wKX; Tue, 17 Jun 2025 08:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750147234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q5w1q0cb2ZhRdbol4tMRAt2Snz/CaqZnfVVJoT1Vy+Y=; b=oqf0qQup6AO83Y2VmsM1ZHvZMgxR7mNySFg7N/2xXKynq55Tu3KM67Iw/5XyfMdfCUWBFZ +h2ALFIjK+m4S4ZLal1GtdhcoKxvp5E8q4wwP6oVlYwj74DoArUoQ9Vesg8C3du9IyFta/ Jmj4oGBccskH6vq7kG5UdTu7TKxCEvcO9vuW1rO/rCCPnwF41DZMcp4jqEGLCipHrV0zUG cgoeL0QF3L53RpWEPoMKKzxXyaJg3hOC+A5P4+gshn0Vf4mnoJYOLODjGEE11AbtIos32t tUteBnqngtYr+QeJqoIZg3D0L3tnGPCTNWG+Sq05LefZVAq+Seml3NgFiCPcfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750147234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q5w1q0cb2ZhRdbol4tMRAt2Snz/CaqZnfVVJoT1Vy+Y=; b=TbGgRGWNQm8gCG4eUfqSdbUJB8p3Ykp7EISm74zoMQkFNjPPSFjRsb1cnUS5JuiDdm3Jps JVgBhk7Of+ngk2iD4OOp/8lD0mdGlhNbMlVHR0Fxwkf3610SpofRQ9sL5PzbFS9Zvd+ICV 9UTB2ImEZocqVYdYLzP8dMhllCAb/uxlSSrBdl96Zyw/7AXJiyanfaTF2kHTDfMYOwEhaD PpxSVQjCagPcLLwky1iyaidS1wgbRWkd3blH2lKEcEbRbBNfOsPFbxbKu1qht/fqg7j5NS w7dtyJ8dtL2a6W705kBNFxmknMXrEEimj1xOcb2YAkdAdhU7xUJKvXTFlVveJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750147234; a=rsa-sha256; cv=none; b=JWJGTncYqglqlFna7b+PZH7V5gfGh26n6fTpxtE0dlsXWQNYnbe0r8md7zKSDe1bFbhikF J04d42XO8sELfnD0ai1VXrDEaiR0B7pOij/LmtT5UVeA7T5ccqgcT772WoGwN3mWVeai6f cpMB9yq5Lg4wlNti/uX5zRbI3NBcPM2MGHuTCK895U2wu7bbuzwh3fDqSijHu623SwMiE/ O0zO2s6EKN/Jg41gaSidsAEPy8CGN3lQortmVindTXf4sAk7RTFE3ZLMCH5MU3+jCW0G6v xH0BIuSY3nu4xvqZbOHqkxcsV8v5X9s5Tx1artQdjXvr43jMR7yWeDH76YMghA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bLznZ2ccqzbq9; Tue, 17 Jun 2025 08:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55H80YEP048835; Tue, 17 Jun 2025 08:00:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55H80Y6K048832; Tue, 17 Jun 2025 08:00:34 GMT (envelope-from git) Date: Tue, 17 Jun 2025 08:00:34 GMT Message-Id: <202506170800.55H80Y6K048832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 1049c079c013 - main - nuageinit.7: language and grammar fixes mostly List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1049c079c013e17b72d64f6b558e9f7e777714f1 Auto-Submitted: auto-generated The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=1049c079c013e17b72d64f6b558e9f7e777714f1 commit 1049c079c013e17b72d64f6b558e9f7e777714f1 Author: Maxim Konovalov AuthorDate: 2025-06-17 07:59:57 +0000 Commit: Maxim Konovalov CommitDate: 2025-06-17 07:59:57 +0000 nuageinit.7: language and grammar fixes mostly --- libexec/nuageinit/nuageinit.7 | 54 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 7e44ce208a9b..dd6c7b5d0a64 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -19,15 +19,15 @@ It is composed of 3 scripts: .Bl -tag -width "nuageinit" .It Cm nuageinit -This script will detect the configuration disk kind of cloud environement the +This script will detect the configuration disk kind of cloud environment the system runs on and gather accordingly the configuration data. -The following cloud environements are supported right now: +The following cloud environments are supported right now: .Bl -tag -width "OpenStack" .It ondisk A cloud agnostic environment where the disk is provided to the system with the configuration data on it. The disk should be formatted in one of the following formats: -.Xr cd9660 4 , +.Xr cd9660 4 or .Xr msdosfs 4 and be labelled (via filesystem label) either @@ -44,17 +44,15 @@ description available in .Xr kenv 2 . .El .Pp -Depending on the cloud environement above +Depending on the cloud environment above, .Nm will attempt to configure the instance. -See -.Sx CONFIGURATION . -This script executes early, +This script executes early after all the local filesystem are mounted but before the network is configured. .It Cm nuageinit_post_net -This script is reponsible processing the configurations that are network -dependant: +This script is responsible for processing the configurations that are network +dependent: .Bl -bullet .It dealing with packages @@ -67,7 +65,7 @@ been passed via the configuration to be executed, via the configuration or because the user_data provided is a script. .El .Pp -The default user for nuageinit is a user named: +The default user for nuageinit is a user named .Va freebsd with a password set to .Va freebsd @@ -77,9 +75,8 @@ and a shell set to The configuration of .Nm is typically done via metadata provided by the cloud provider. -The metadata is presented to nuageinit in different form depending on +The metadata is presented to nuageinit in different forms depending on the provider: -provider: .Bl -tag -width "config-2" .It nocloud If the data is provided via a disk labelled @@ -88,20 +85,20 @@ then the metadata is provided in the form of a file named .Pa meta-data in YAML format. .Nm -Will configure the hostname of the instance according the value of the +will configure the hostname of the instance according the value of the following variables .Va local-hostname or .Va hostname . .It config-2 If the data is provided via a disk labelled -.Va config-2 , -or if fetched from OpenStack, +.Va config-2 +or if it is fetched from OpenStack, the metadata is expected in two json files: .Pp The .Pa meta_data.json -file supportes the following keys: +file supports the following keys: .Bl -tag -width "public_keys" .It Ic hostname Set the hostname of the instance. @@ -125,7 +122,7 @@ Array of network configurations to be set. Along with the metadata, a user data file is provided, either named .Pa user_data or -.Pa user-data +.Pa user-data . If this file starts with a .Qq #! , it will be executed at the end of the boot via @@ -153,16 +150,16 @@ An array of strings or objects to be created: If the entry is a string, a group using this string as a name will be created. .It -if the entry is a an object, the +if the entry is an object, the .Qq Ar key will be used as the name of the group, the .Qq Ar value -will is expected to be a list of members (array), specified by name. +is expected to be a list of members (array), specified by name. .El .It Ic ssh_keys An object of multiple key/values, .Qq Cm keys -being in the form: +being in the form .Ar algo_private or .Ar algo_public , @@ -212,15 +209,15 @@ Ignored if an encrypted password is already provided. .It Ic groups The list of other groups the user should belong to. .It Ic locked -Boolean to determine if the user accound should be locked. +Boolean to determine if the user account should be locked. .It Ic sudo An entry which should be appended to .Pa /usr/local/etc/sudoers.d/90-nuageinit-users .El .Pp -A special case exist: if the entry is a simple string with the following value -.Qq default -The the default user is created. +A special case exist: if the entry is a simple string with the value +.Qq default , +than the default user is created. .It Ic chpasswd Change the passwords for users, it accepts the following keys: .Bl -tag -width "expire" @@ -230,15 +227,15 @@ Boolean to force the user to changes their password during the first login An array of objects: .Bl -tag -width "password" .It Ic user -Specify the user who's password will be changed. +Specify the user whose password will be changed. .It Ic password -Specify a text line with the new password, or -Specify the user who's password will be changed. +Specify a text line with the new password or +specify the user whose password will be changed. .Qq Cm RANDOM to assign the password randomly. If the textline starts with .Qq Cm $x$ -Where x is a number, then the password is considered encrypted, +where x is a number, then the password is considered encrypted, otherwise the password is considered plaintext. .El .El @@ -276,6 +273,7 @@ ssh_keys: .Xr cd9660 4 , .Xr msdosfs 4 , .Xr smbios 4 , +.Xr ssh_config 5 , .Xr rc 8 .Sh STANDARDS .Nm