[lxc-devel] [lxd/master] Doc tweaks

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180503/e931b4d3/attachment.bin>
-------------- next part --------------
From 5c6286ce01b882154e0adac7015e19088abac5a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 3 May 2018 10:40:51 +0200
Subject: [PATCH 1/2] doc: s/status command/info command/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4527

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 doc/security.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/security.md b/doc/security.md
index 552e529ba..c9d919976 100644
--- a/doc/security.md
+++ b/doc/security.md
@@ -29,7 +29,7 @@ fingerprint will be shown to the user.
 
 The user will then be asked to confirm that this is indeed the server's
 fingerprint which they can manually check by connecting to or asking
-someone with access to the server to run the status command and compare
+someone with access to the server to run the info command and compare
 the fingerprints.
 
 After that, the user must enter the trust password for that server, if

From 696a2d03a95269ec445925c74d7d2d02eb160f30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 3 May 2018 10:51:51 +0200
Subject: [PATCH 2/2] lxd/init: Explain password less behavior
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #4524

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 lxd/main_init_interactive.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lxd/main_init_interactive.go b/lxd/main_init_interactive.go
index 4d961c13a..73ae50d59 100644
--- a/lxd/main_init_interactive.go
+++ b/lxd/main_init_interactive.go
@@ -627,6 +627,9 @@ they otherwise would.
 		netPort := cli.AskInt("Port to bind LXD to [default=8443]: ", 1, 65535, "8443")
 		config.Config["core.https_address"] = fmt.Sprintf("%s:%d", netAddr, netPort)
 		config.Config["core.trust_password"] = cli.AskPassword("Trust password for new clients: ")
+		if config.Config["core.trust_password"] == "" {
+			fmt.Printf("No password set, client certificates will have to be manually trusted.")
+		}
 	}
 
 	// Ask if the user wants images to be automatically refreshed