Commit b501d2e

@@ -2,7 +2,7 @@
 
 `ssh tmc@tmc.console.xen.prgmr.com`
 * <kbd>9</kbd> - Install a new OS
-* <kbd>h</kbd> - Ubuntu Bionic 18.04
+* <kbd>k</kbd> - Ubuntu Focal 20.04
 * <kbd>y</kbd> - Are you sure
 * <kbd>y</kbd> - Add current ssh keys
 * <kbd>0</kbd> - Return to main menu
@@ -12,7 +12,8 @@
 
 ### Pre-ansible changes
 
-`ssh-keygen -R trustme.click -R $(dig +short trustme.click)`  
+`ssh-keygen -R trustme.click`  
+`ssh-keygen -R $(dig +short trustme.click)`  
 `ssh root@tmc -A`
 
 * Disable root ssh access
@@ -33,6 +34,7 @@
 * Reconnect ssh as ubuntu, Restart ssh, Verify root can't login via ssh
    
   `$ exit`  
+  `# exit`  
   `$ ssh ubuntu@tmc` # expect success  
   `$ sudo systemctl restart ssh`  
   `$ exit`  
@@ -40,21 +42,18 @@
   `$ ssh ubuntu@tmc -A`
   
 * Setup python & ansible
+  TODO: after 2020-10-01, try installing python-apt in a venv again, I gave up
 
    ```
    sudo apt update
-   sudo sudo apt install -y software-properties-common
-   sudo add-apt-repository -y ppa:deadsnakes/ppa
-   sudo apt install -y python3.9 python3.9-dev python3.9-distutils python3.9-venv libffi-dev git gcc g++ libapt-pkg-dev
+   sudo apt install -y python3-pip git
+   python3.8 -m pip install --user --upgrade pip wheel
+   python3.8 -m pip install --user ansible
+   source ~/.profile
    mkdir git
    cd git
    git clone git@github.com:bryfry/trustme.click.git
    cd trustme.click
-   python3.9 -m venv tmc_venv
-   source tmc_venv/bin/activate
-   python3.9 -m pip install --upgrade pip wheel
-   python3.9 -m pip install git+https://salsa.debian.org/apt-team/python-apt.git@1.8.6
-   python3.9 -m pip install ansible
    ```
   
 * Run ansible playbook