From 861f5e893fb93964a22bbc684f1c8e68da29209c Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 18 Jun 2019 23:51:46 +0000
Subject: [PATCH] Streamline documented bup setup process

Reorder some of the commands used to set up and configure the bup
user on backup servers so the process is more straightforward and
requires fewer mental context switches.

Change-Id: I73cb80a04b8b5a74bb0857b4c8b6fb09030d6306
---
 doc/source/sysadmin.rst | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst
index 3ef02c8b1d..ea19f4fbd7 100644
--- a/doc/source/sysadmin.rst
+++ b/doc/source/sysadmin.rst
@@ -239,20 +239,18 @@ And then ``cat /root/.ssh/id_rsa.pub`` for use later.
 On the backup servers::
 
   # add bup user
-  sudo su -
   BUPUSER=bup-<short-servername>  # eg, bup-jenkins-dev
-  useradd -r $BUPUSER -s /bin/bash -d /opt/backups/$BUPUSER -m
-  exit
-
+  sudo useradd -r $BUPUSER -s /bin/bash -d /opt/backups/$BUPUSER -m
   sudo su - $BUPUSER
-  # should be in home directory /opt/backups/$BUPUSER
-  mkdir .ssh
-  cat >.ssh/authorized_keys
 
   # initalise bup
   bup init
 
-and add this to the authorized_keys file::
+  # should be in home directory /opt/backups/$BUPUSER
+  mkdir .ssh
+  cat >.ssh/authorized_keys
+
+write this into the authorized_keys file and end with ^D on a blank line::
 
   command="BUP_DEBUG=0 BUP_FORCE_TTY=3 bup server",no-port-forwarding,no-agent-forwarding,no-X11-forwarding,no-pty <ssh key from earlier>