From 1d7716d7c92ae89dabba31b49ae02f019c833dff Mon Sep 17 00:00:00 2001
From: root <root@vern.cc>
Date: Tue, 31 Jan 2023 17:19:57 +0000
Subject: [PATCH] Miniflux scripts

---
 pubnixvm/mktuser  |  6 +++---
 tilserv/accept    |  5 ++++-
 tilserv/delmfuser | 12 ++++++++++++
 tilserv/deluser   |  2 +-
 tilserv/deny      |  5 ++++-
 tilserv/dobackup  |  2 +-
 tilserv/mkmfuser  |  8 ++++++++
 tilserv/renew     |  4 ++--
 8 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100755 tilserv/delmfuser
 create mode 100755 tilserv/mkmfuser

diff --git a/pubnixvm/mktuser b/pubnixvm/mktuser
index d438407..791e638 100755
--- a/pubnixvm/mktuser
+++ b/pubnixvm/mktuser
@@ -1,4 +1,7 @@
 #!/usr/bin/env -S bash -e
+
+
+
 [[ -z "$2" ]] && {
 	printf 'Usage: %s username password [user|admin] [shell] <<< pubkey\n' "$0"
 	exit 1
@@ -21,9 +24,6 @@ chmod 755 "$_HOME/public_gopher"
 chmod 755 "$_HOME/public_gcdn"
 systemctl restart gemini
 sed -i "s/USER/${1}/g" "$_HOME"/.config/nixpkgs/home.nix
-sed -i "s/replaceme/${1}/g" "$_HOME"/.config/aerc/accounts.conf
 sudo -u $1 nix-shell '<home-manager>' -A install
 printf "%s\n%s\n" "$2" "$2" | passwd "$1"
 zfs set userquota@"${1}"=20G pool1/home
-sudo -u postgres psql -c "create role ${1};"
-sudo -u postgres createdb -O ${1} ${1}
diff --git a/tilserv/accept b/tilserv/accept
index 5394bbd..9443f06 100755
--- a/tilserv/accept
+++ b/tilserv/accept
@@ -11,4 +11,7 @@
 }
 
 read -rp "Accept $1's application? [y/N] "
-[[ $REPLY =~ [Yy] ]] && bash -e "/var/tmp/register/$1" || exit 3
+[[ $REPLY =~ [Yy] ]] && {
+	bash -e "/var/tmp/register/$1"
+	echo "$1" >> "/var/tmp/users-accepted-$(date -I)"
+} || exit 3
diff --git a/tilserv/delmfuser b/tilserv/delmfuser
new file mode 100755
index 0000000..a295880
--- /dev/null
+++ b/tilserv/delmfuser
@@ -0,0 +1,12 @@
+#!/usr/bin/env -S bash -e
+
+[[ -z "$1" ]] && {
+	printf "Usage: %s username\n" "$0"
+	exit 1
+}
+if [[ $(curl -s -XGET -H "X-Auth-Token: $(</root/priv/minifluxtoken)" https://mf.vern.cc/v1/users/"$1" | jq -c .id) == "null" ]]; then
+	echo "No such user"
+	exit 1
+fi
+
+curl -s -XDELETE -H "X-Auth-Token: $(</root/priv/minifluxtoken)" https://mf.vern.cc/v1/users/"$(curl -s -XGET -H "X-Auth-Token: $(</root/priv/minifluxtoken)" https://mf.vern.cc/v1/users/"$1" | jq -c .id)"
diff --git a/tilserv/deluser b/tilserv/deluser
index 0134957..3c33b06 100755
--- a/tilserv/deluser
+++ b/tilserv/deluser
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S bash -e
+#!/usr/bin/env bash
 
 [[ -z "$1" ]] && {
 	printf 'Usage: %s username\n' "$0"
diff --git a/tilserv/deny b/tilserv/deny
index 341ebe5..609134c 100755
--- a/tilserv/deny
+++ b/tilserv/deny
@@ -11,4 +11,7 @@
 }
 
 read -rp "Deny $1's application? [y/N] "
-[[ $REPLY =~ [Yy] ]] && rm -f "/var/tmp/register/$1" || exit 3
+[[ $REPLY =~ [Yy] ]] && {
+	rm -f "/var/tmp/register/$1"
+	echo "$1" >> "/var/tmp/users-denied-$(date -I)"
+} || exit 3
diff --git a/tilserv/dobackup b/tilserv/dobackup
index 189b092..5cf5202 100755
--- a/tilserv/dobackup
+++ b/tilserv/dobackup
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S bash -e
+#!/usr/bin/env -S bash -x
 
 backupscript() {
 	targetpool="bighdd/backup"
diff --git a/tilserv/mkmfuser b/tilserv/mkmfuser
new file mode 100755
index 0000000..3b8a40b
--- /dev/null
+++ b/tilserv/mkmfuser
@@ -0,0 +1,8 @@
+#!/usr/bin/env -S bash -e
+
+[[ -z "$2" ]] && {
+	printf "Usage: %s username password\n" "$0"
+	exit 1
+}
+
+curl -XPOST -H "X-Auth-Token: $(</root/priv/minifluxtoken)" -H 'Content-Type: application/json' https://mf.vern.cc/v1/users -d "{\"username\":\"$1\", \"password\": \"$2\", \"is_admin\": false}"
diff --git a/tilserv/renew b/tilserv/renew
index 7bbce17..f4b53d8 100755
--- a/tilserv/renew
+++ b/tilserv/renew
@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash 
 systemctl stop nginx
 certbot certonly --manual # vern.cc,*.vern.cc,*.bw.vern.cc,*.fandom.vern.cc,*.breezewiki.vern.cc
 systemctl start nginx
-cat /etc/letsencrypt/live/vern.cc/{fullchain.pem,privkey.pem} > .znc/znc.pem
+cat /etc/letsencrypt/live/vern.cc/{fullchain.pem,privkey.pem} > ~znc/.znc/znc.pem
 scp -r -P1816 /etc/letsencrypt iceberg.vern.cc:/etc
 cat /etc/letsencrypt/live/vern.cc/fullchain.pem > /sshfs/var/gemini/enc/fullchain.pem
 cat /etc/letsencrypt/live/vern.cc/privkey.pem > /sshfs/var/gemini/enc/privkey.pem