From 762a2526766540ff59ee5dd42a8fe091c27514c5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 17 Sep 2019 12:04:37 -0400 Subject: [PATCH] club updates --- README.md | 5 ++++- makeuser | 16 +++++++++------- welcome-email.tmpl | 40 +++++++++++++++++----------------------- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 26dfeec..0fe3dd8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ # makeuser -A script that allows admins of tilde.team to make user accounts easily. \ No newline at end of file +A script that allows admins to make user accounts easily. + +Run `make` to install the script to `/usr/local/bin`. + diff --git a/makeuser b/makeuser index be8f23f..8f1e5d3 100755 --- a/makeuser +++ b/makeuser @@ -1,6 +1,6 @@ #!/bin/bash # --------------------------------------------------------------------------- -# makeuser - tilde.team new user creation +# makeuser - tilde.club new user creation # Usage: makeuser [-h|--help] "" # --------------------------------------------------------------------------- @@ -20,7 +20,7 @@ sub_to_list() { echo " From: $1 Subject: subscribe -" | sudo -u $1 sendmail tildeteam-join@lists.tildeverse.org +" | sudo -u $1 sendmail tildeclub-join@lists.tildeverse.org } case $1 in @@ -31,6 +31,10 @@ case $1 in *) [[ $# -ne 3 ]] && error_exit "not enough args" + if id $1 > /dev/null 2>&1; then + error_exit "user $1 already added" + fi + echo "adding new user $1" newpw=$(pwgen -1B 10) pwcrypt=$(perl -e "print crypt('${newpw}', 'sa');") @@ -39,18 +43,16 @@ case $1 in echo "sending welcome mail" sed -e "s/newusername/$1/g" -e "s/newpassword/$newpw/" /usr/local/bin/welcome-email.tmpl \ - | sendmail $1 $2 sudoers@tilde.team + | sendmail $1 $2 root echo "subscribing to mailing list" sub_to_list $1 - echo "creating znc account" - sudo -u znc /home/znc/add_znc_user.sh $1 + echo "removing .git from new homedir" + rm -rf /home/$1/.git echo "adding ssh pubkey" echo "$3" | sudo tee /home/$1/.ssh/authorized_keys - echo "announcing new user on mastodon" - toot "welcome new user ~$1!" ;; esac diff --git a/welcome-email.tmpl b/welcome-email.tmpl index b335ea4..edaa103 100644 --- a/welcome-email.tmpl +++ b/welcome-email.tmpl @@ -1,43 +1,37 @@ -Subject: welcome to tilde.team! +Subject: welcome to tilde.club! hey ~newusername, -welcome to tilde.team! +welcome to tilde.club! -your new account has been established. you can ssh into tilde.team with +your new account has been established. you can ssh into tilde.club with the ssh key you supplied on registration. your password is "newpassword". please change it when you log in for -the first time. the password is used for imap/smtp auth, not shell login, -which is set to only use ssh key authentication. +the first time by running the passwd command. the password is used for +imap/smtp auth, not shell login, which is currently enabled for legacy +reasons and will be soon changed to only use ssh key authentication. -the greatest value of tilde.team is not the services provided by the +the greatest value of tilde.club is not the services provided by the server, but rather the interesting and welcoming community built by its users. this is possible because of people like you who choose to make -this a great place. the best way you can help tilde.team is by working +this a great place. the best way you can help tilde.club is by working to support a great system culture. chat on irc; build cool programs and 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 -for more info. +your ~/public_html directory is served at https://tilde.club/~newusername/ -check out our wiki at https://tilde.wiki/ for more information (and +check out our wiki at https://tilde.club/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) -or https://tilde.chat site for information on how to connect from elsewhere. +our irc is tilde.chat, an irc network connecting several tilde servers. +run the `chat` command at your shell to start up weechat (a terminal-based +irc client) auto-connected and joined to #club. see the https://tilde.chat +site for information on how to connect externally if you prefer that instead. -note that when you first log in, you'll enter a byobu session, which is a terminal -multiplexer (see https://superuser.com/a/423397/866501 for info) with weechat and -mutt already open for you. if you're familiar with tmux, you can use it as usual, -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! +we look forward to seeing you around! welcome to the ~club! -we look forward to seeing you around! welcome to the ~team! - -~tilde.team admins +your tilde.club admins, +~benharri and ~deepend