updated quick-start and upgrade tutorials

3 files changed, 37 insertions, 9 deletions

diff --git a/pages/docs/platform/tutorials/quick-start.md b/pages/docs/platform/tutorials/quick-start.md
index af4b719..80a6ef2 100644
--- a/pages/docs/platform/tutorials/quick-start.md
+++ b/pages/docs/platform/tutorials/quick-start.md
@@ -95,14 +95,21 @@ You should now have the following files:
 Now add yourself as a privileged sysadmin who will have access to deploy to servers:
 
     workstation$ cd example
-    workstation$ leap add-user --self
+    workstation$ leap add-user louise --self
+
+Replace "louise" with whatever you want your sysadmin username to be.
+
+NOTE: Make sure you change directories so that the `leap` command is run from within the provider instance directory. Most `leap` commands only work when run from a provider instance.
 
 Now create the necessary keys and certificates:
 
     workstation$ leap cert ca
     workstation$ leap cert csr
 
-What do these commands do? The first command will create two Certificate Authorities, one that clients will use to authenticate with the servers and one for backend servers to authenticate with each other. The second command creates a Certificate Signing Request suitable for submission to a commercial CA. It also creates a self-signed certificate for your domain that can be used temporarily for testing.
+What do these commands do? The first command will create two Certificate Authorities, one that clients will use to authenticate with the servers and one for backend servers to authenticate with each other. The second command creates a Certificate Signing Request suitable for submission to a commercial CA. It also creates two "dummy" files for you to use temporarily:
+
+* `files/cert/example.org.crt` -- This is a "dummy" certificate for your domain that can be used temporarily for testing. Once you get a real certificate from a CA, you should replace this file.
+* `files/cert/commercial_ca.crt` -- This is "dummy" CA cert the corresponds to the dummy domain certificate. Once you replace the domain certificate, also replace this file with the CA cert from the real Certificate Authority.
 
 If you plan to run a real service provider, see important information on [[managing keys and certificates => keys-and-certificates]].
 
@@ -135,6 +142,8 @@ Create a node, with the services "webapp" and "couchdb", and then start the loca
     workstation$ leap node add --local wildebeest services:webapp,couchdb
     workstation$ leap local start wildebeest
 
+It will take a while to download the Virtualbox base box and create the virtual machine.
+
 Deploy your provider
 =========================================
 
@@ -144,7 +153,9 @@ Node initialization only needs to be done once, but there is no harm in doing it
 
     workstation$ leap node init wildebeest
 
-This will initialize the node `wildebeest`. When `leap node init` is run, you will be prompted to verify the fingerprint of the SSH host key and to provide the root password of the server(s). You should only need to do this once.
+This will initialize the node `wildebeest`.
+
+For non-local nodes, when `leap node init` is run, you will be prompted to verify the fingerprint of the SSH host key and to provide the root password of the server(s). You should only need to do this once.
 
 ### Deploy to the node
 
@@ -164,7 +175,7 @@ Alternately, if you have access to modify the DNS zone entries for your domain:
 
     workstation$ leap compile zone
 
-NOTE: The resulting zone file is incomplete because it is missing a serial number. Use the output of `leap compile zone` as a guide, but do not just copy and paste the output.
+NOTE: The resulting zone file is incomplete because it is missing a serial number. Use the output of `leap compile zone` as a guide, but do not just copy and paste the output. Also, the `compile zone` output will always exclude mention of local nodes.
 
 The DNS method will not work for local nodes created with Vagrant.
 
diff --git a/pages/docs/platform/tutorials/single-node-vpn.md b/pages/docs/platform/tutorials/single-node-vpn.md
index 42e61a1..dc1df7a 100644
--- a/pages/docs/platform/tutorials/single-node-vpn.md
+++ b/pages/docs/platform/tutorials/single-node-vpn.md
@@ -58,13 +58,24 @@ The node configuration file should now look like this:
 
 Why two different addresses? Without this, the traffic from one VPN user to another would not be encrypted. This is because the routing table of VPN clients must ensure that packets with a destination of the VPN gateway are sent unmodified and don't get passed through the VPN's encryption.
 
+Generate a Diffie-Hellman file
+-------------------------------------------
+
+Next we need to create a Diffie-Hellman parameter file, used for forward secret OpenVPN ciphers. You only need to do this once.
+
+    workstation$ leap cert dh
+
+Feel free to erase the resulting DH file and regenerate it as you please.
+
 Deploy to the node
 --------------------
 
-Now you should deploy to your node.
+Now you should deploy to your node. This may take a while.
 
     workstation$ leap deploy
 
+If the deploy was not successful, try to run it again.
+
 Test it out
 ---------------------------------
 
@@ -76,6 +87,7 @@ Then fire up the Bitmask client, register a new user with your provider, and tur
 
 Alternately, you can also manually connect to your VPN gateway using OpenVPN on the command line:
 
+    workstation$ sudo apt install openvpn
     workstation$ leap test init
     workstation$ sudo openvpn --config test/openvpn/default_unlimited.ovpn
 
diff --git a/pages/docs/platform/upgrading/upgrade-0-8.md b/pages/docs/platform/upgrading/upgrade-0-8.md
index 35a5441..77be20f 100644
--- a/pages/docs/platform/upgrading/upgrade-0-8.md
+++ b/pages/docs/platform/upgrading/upgrade-0-8.md
@@ -53,9 +53,10 @@ There are the [Debian release notes on how to upgrade from wheezy to jessie](htt
     script -t 2>~/leap_upgrade-jessiestep.time -a ~/upgrade-jessiestep.script
 
     # ensure you have a good wheezy install:
-    apt-get autoremove
+    export DEBIAN_FRONTEND=noninteractive
+    apt-get autoremove --yes
     apt-get update
-    DEBIAN_FRONTEND=noninteractive apt-get -y -o DPkg::Options::=--force-confold dist-upgrade
+    apt-get -y -o DPkg::Options::=--force-confnew dist-upgrade
 
     # if anything is held, you need to resolve it before continuing:
     dpkg --audit
@@ -63,6 +64,7 @@ There are the [Debian release notes on how to upgrade from wheezy to jessie](htt
 
     # switch sources to jessie
     sed -i 's/wheezy/jessie/g' /etc/apt/sources.list
+    rm /etc/apt/sources.list.d/*
     echo "deb http://deb.leap.se/0.8 jessie main" > /etc/apt/sources.list.d/leap.list
 
     # remove pinnings to wheezy
@@ -77,14 +79,17 @@ There are the [Debian release notes on how to upgrade from wheezy to jessie](htt
     apt-get -o APT::Get::Trivial-Only=true dist-upgrade
 
     # do first stage upgrade
-    DEBIAN_FRONTEND=noninteractive apt-get -y -o DPkg::Options::=--force-confold upgrade
+    apt-get -y -o DPkg::Options::=--force-confnew upgrade
 
     # repeat dist-upgrade until it makes no more changes:
-    DEBIAN_FRONTEND=noninteractive apt-get -y -o DPkg::Options::=--force-confold dist-upgrade
+    apt-get -y -o DPkg::Options::=--force-confnew dist-upgrade
 
     # resolve any apt issues if there are some
     apt-get -f install
 
+    # clean up extra packages
+    apt-get autoremove --yes
+
     reboot