attribution for script authors

10 files changed, 12 insertions, 20 deletions

diff --git a/README.md b/README.md
index 0717b04..56b70ac 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,6 @@
 Scripts that make [tilde.institute](https://tilde.institute) work. 
 
 Includes new user creation
-and other miscellaneous tasks, such as various monitoring scripts.  
+and other miscellaneous tasks, such as various monitoring scripts.
 
-The scripts are written by gbmor, except for the following, which were *not*, but may have been committed to the repo by gbmor:
-  * `bin/showwhoison` (written by Kneezle)
-  * `bin/newmail.sh` (Kneezle)
-  * `bin/newuseralert.py` (Kneezle)
-  * `bin/newuseralertv3.py` (Kneezle)
-  * `bin/toot.py` (written by Ben Harris of [tilde.team](https://tilde.team))
-
-`bin/makeuser` is originally based on [tilde.team](https://tilde.team)'s, but has been extended and modified so much it bears very little resemblance to the original.
+Scripts have author credited at the top of the file
diff --git a/bin/connusers.py b/bin/connusers.py
index d2672f2..998669b 100755
--- a/bin/connusers.py
+++ b/bin/connusers.py
@@ -1,7 +1,7 @@
 #!/usr/local/bin/python3 -I
 
 # Lists currently connected users for https://tilde.institute/stats
-# ben@gbmor.dev
+# gbmor <ben@gbmor.dev>
 
 from sys import exit
 import subprocess
diff --git a/bin/makeuser b/bin/makeuser
index e7bc4b8..91e3b56 100755
--- a/bin/makeuser
+++ b/bin/makeuser
@@ -2,7 +2,7 @@
 # ---------------------------------------------------------------------------
 # makeuser - tilde.institute new user creation
 # Usage: makeuser [-h|--help] <username> <email> "<pubkey>"
-# ben@gbmor.dev
+# <gbmor> ben@gbmor.dev
 # ---------------------------------------------------------------------------
 
 PROGNAME=${0##*/}
diff --git a/bin/motdrotate.py b/bin/motdrotate.py
index 01d7a77..1f178cc 100755
--- a/bin/motdrotate.py
+++ b/bin/motdrotate.py
@@ -7,8 +7,7 @@ import random
 ## Uses a skeleton motd plus a random quote ##
 ## to produce a motd with a nifty quote.    ##
 ##------------------------------------------##
-## Created by ahriman - ben@gbmor.dev       ##
-## --> BSD 3-clause license applies         ##
+## <gbmor> ben@gbmor.dev                    ##
 ##############################################
 
 def pullfile(filename):
diff --git a/bin/newmail.sh b/bin/newmail.sh
index a9da32b..6ed65e6 100644
--- a/bin/newmail.sh
+++ b/bin/newmail.sh
@@ -1,6 +1,7 @@
 #!/usr/local/bin/bash
 
 # Notifies users of newly received mail
+# kneezle@tilde.institute
 
 NewMail(){
     NEWMAIL=$(mailx &)
diff --git a/bin/newuseralertv3.py b/bin/newuseralertv3.py
index b62a4bc..4987075 100755
--- a/bin/newuseralertv3.py
+++ b/bin/newuseralertv3.py
@@ -1,4 +1,7 @@
 #!/usr/local/bin/python3
+#
+# kneezle@tilde.institute
+
 import os
 import argparse
 import http.client
diff --git a/bin/regusers.py b/bin/regusers.py
index 3fbb9df..53997da 100755
--- a/bin/regusers.py
+++ b/bin/regusers.py
@@ -2,7 +2,7 @@
 
 # Lists all the currently registered users extant on the system
 # for the stats page at https://tilde.institute/stats
-# ben@gbmor.dev
+# gbmor <ben@gbmor.dev>
 
 import os
 import sys
diff --git a/bin/rmuser b/bin/rmuser
index 4413ebc..db3ea38 100755
--- a/bin/rmuser
+++ b/bin/rmuser
@@ -2,7 +2,7 @@
 
 # Hopefully, this never has to be used.
 # Cleans up and removes a user from the system.
-# ben@gbmor.dev
+# gbmor <ben@gbmor.dev>
 
 echo "Removing user $1 from the system"
 userdel $1
diff --git a/bin/toot.py b/bin/toot.py
index a8d0b08..ae94f30 100755
--- a/bin/toot.py
+++ b/bin/toot.py
@@ -1,9 +1,5 @@
 #!/usr/local/bin/python2
 
-# Called by bin/makeuser to send a 'toot' to the
-# tilde.institute mastodon account at
-# https://tilde.zone/@tildeinstitute
-
 import json
 import os
 import sys
diff --git a/bin/weekconns.py b/bin/weekconns.py
index b5df86d..ed9d375 100755
--- a/bin/weekconns.py
+++ b/bin/weekconns.py
@@ -3,7 +3,7 @@
 # Lists the users who have connected in
 # the last week for the stats page at
 # https://tilde.institute/stats
-# ben@gbmor.dev
+# <gbmor> ben@gbmor.dev
 
 from sys import exit
 import subprocess