actually copy the ssh key over

makeuser

@@ -38,7 +38,7 @@ case $1 in
         fi
 
         printf "adding new user %s\n" "$1"
-        newpw=$(pwgen -1B 10)
+        newpw=$(pwgen -1B 20)
         sudo useradd -m -g 100 -s /bin/bash "$1" \
             || error_exit "couldn't add user"
         printf "%s:%s\n" "$1" "$newpw" | sudo chpasswd
@@ -62,7 +62,17 @@ case $1 in
         printf "cleanup current signup\n"
         sudo sed -i"" "/\b$1\b/d" /var/signups_current
 
-        echo "fix sorting in /etc/passwd"
+        printf "fix sorting in /etc/passwd\n"
         sudo pwck -s
+
+        printf "applying disk quota\n"
+        sudo setquota -u "$1" 1048576 3145728 0 0 /home
+
+        printf "copying user to bsd.tilde.team\n"
+        newid=$(id -u "$1")
+        printf %s "$newpw" | sudo ssh bsd.tilde.team -- pw useradd -n "$1" -u "$newid" -g team -md /home/"$1" -h0
+        sudo ssh bsd.tilde.team -- mkdir -p /home/"$1"/.ssh
+        printf "%s\n" "$3" | sudo ssh bsd.tilde.team -- tee /home/"$1"/.ssh/authorized_keys
+        sudo ssh bsd.tilde.team -- chown -R "$1":team /home/"$1"/.ssh
         ;;
 esac

welcome-email.tmpl

@@ -21,14 +21,14 @@ share them with others; focus on learning, and help others learn; be a
 good example for others; have fun!
 
 your ~/public_html directory is served at https://tilde.team/~newusername/
-(you can also use https://newusername.tilde.team). see https://tilde.wiki/?page=tildepages
+(you can also use https://newusername.tilde.team). see https://tilde.team/wiki/tildepages
 for more info.
 
-check out our wiki at https://tilde.wiki/ for more information (and
+check out our wiki at https://tilde.team/wiki/ for more information (and
 maybe help us write a new wiki article:)
 
 our irc is tilde.chat, an irc network connecting several
-tilde servers. see our wiki article (https://tilde.team/wiki/?page=irc)
+tilde servers. see our wiki article (https://tilde.team/wiki/irc)
 or https://tilde.chat site for information on how to connect from elsewhere.
 
 note that when you first log in, you'll enter a byobu session, which is a terminal
@@ -38,9 +38,9 @@ replacing ctrl-b with ctrl-a. otherwise, you can disable the autolaunch with the
 byobu-disable command. feel free to holler on the mailing list or on irc if you
 have any questions or need help!
 
-the expected ssh fingerprint is SHA256:R3qNfKIF3IiXhKCbFX6rCKl73yzexi9Wodsow6XFres
-and can also be found in the sshfp dns records. enable VerifyHostKeyDNS
-in your ~/.ssh/config to check against that.
+our ssh fingerprints can be found in our sshfp dns records.
+add -o 'VerifyHostKeyDNS=yes' to your ssh command or set it in
+your local ~/.ssh/config.
 
 we look forward to seeing you around! welcome to the ~team!