From a2c7e3667dd718ccc48792183e5398253dc7f774 Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Wed, 1 Jul 2020 01:21:07 -0600
Subject: [PATCH] allow alternate username

---
 ssh-utils/ssh-adduser.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/ssh-utils/ssh-adduser.sh b/ssh-utils/ssh-adduser.sh
index 27c6dc8..e3ee4ff 100644
--- a/ssh-utils/ssh-adduser.sh
+++ b/ssh-utils/ssh-adduser.sh
@@ -18,32 +18,33 @@
     # Add User app
     # Picking 'app' because that seems to be what the # Docker/Vagrant
     # crowd is doing. TODO: Other ideas? me, user, tron
-    adduser --disabled-password --gecos "" app
+    my_name="${1:-"app"}"
+    adduser --disabled-password --gecos '' "$my_name"
     my_password=$(openssl rand -hex 16)
-    printf "$my_password"'\n'"$my_password" | passwd app
+    printf "$my_password"'\n'"$my_password" | passwd "$my_name"
 
     # make 'app' a sudo-er (admin)
-    adduser app sudo
-    echo "app ALL=(ALL:ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/app
+    adduser "$my_name" sudo
+    echo "$my_name ALL=(ALL:ALL) NOPASSWD: ALL" | tee "/etc/sudoers.d/$my_name"
 
     # allow users who can already login as 'root' to login as 'app'
-    mkdir -p /home/app/.ssh/
-    chmod 0700 /home/app/.ssh/
-    cp -r "$HOME/.ssh/authorized_keys" /home/app/.ssh/
-    chmod 0600 /home/app/.ssh/authorized_keys
-    touch /home/app/.ssh/config
-    chmod 0644 /home/app/.ssh/config
-    chown -R app:app /home/app/.ssh/
+    mkdir -p "/home/$my_name/.ssh/"
+    chmod 0700 "/home/$my_name/.ssh/"
+    cp -r "$HOME/.ssh/authorized_keys" "/home/$my_name/.ssh/"
+    chmod 0600 "/home/$my_name/.ssh/authorized_keys"
+    touch "/home/$my_name/.ssh/config"
+    chmod 0644 "/home/$my_name/.ssh/config"
+    chown -R "$my_name":"$my_name" "/home/$my_name/.ssh/"
 
     # ensure that 'app' has an SSH Keypair
-    sudo -i -u app bash -c 'ssh-keygen -b 2048 -t rsa -f /home/app/.ssh/id_rsa -q -N ""'
+    sudo -i -u "$my_name" bash -c "ssh-keygen -b 2048 -t rsa -f '/home/$my_name/.ssh/id_rsa' -q -N ''"
 
     # Install webi for the new 'app' user
     WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
-    sudo -i -u app bash -c "curl -fsSL '$WEBI_HOST/webi' | bash" \
-        || sudo -i -u app bash -c "wget -q -O - '$WEBI_HOST/webi' | bash"
+    sudo -i -u "$my_name" bash -c "curl -fsSL '$WEBI_HOST/webi' | bash" \
+        || sudo -i -u "$my_name" bash -c "wget -q -O - '$WEBI_HOST/webi' | bash"
 
     # TODO ensure that ssh-password login is off
 
-    echo "Created user 'app' with password '$my_password'"
+    echo "Created user '$my_name' with password '$my_password'"
 }
-- 
2.25.1