add ssh key and create nextcloud user;\n\nCo-authored-by: smoorg <smoorg@tylda.org>

.gitignore

@@ -0,0 +1 @@
+.env

add_ssh_key.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+[ -n "$1" ] && login=$1 || read -p "provide login: " login
+[ -n "$2" ] && ssh_key=$2 || read -p "provide ssh key: " ssh_key
+
+ssh_dir=/home/$login/.ssh
+mkdir -p "$ssh_dir"
+[ ! -f "$ssh_dir/authorized_keys" ] && touch $ssh_dir/authorized_keys
+
+# add it to authorized_keys but avoid adding it twice
+ak=$ssh_dir/authorized_keys
+[ ! grep "$ssh_key" $ak ] && echo "$ssh_key" >> $ak
+
+# ssh wont work without it
+chmod -R 0700 /home/$login/.ssh
+chown -R $login:$login $ssh_dir

add_user.sh

@@ -2,11 +2,13 @@
 # Usage: add_user.sh <login>
 set -e
 
+source /root/helpers/.env
+
 LOGIN="$1"
 [ -z "$LOGIN" ] && { echo "Użycie: $0 <login>"; exit 1; }
 
 # 1. Użytkownik i hasło
-PASS="$(openssl rand -base64 12)"
+PASS="$(openssl rand -base64 16 | sed 's/[\/\+\=\\]//g')"
 adduser -D -s /bin/sh -h /home/$LOGIN -H "$LOGIN"
 echo "$LOGIN:$PASS" | chpasswd
 addgroup $LOGIN tildeusers
@@ -96,7 +98,17 @@ mkdir -p /home/$LOGIN/.gnupg
 chmod 0700 /home/$LOGIN/.ssh
 chmod 0700 /home/$LOGIN/.gnupg
 
-sendmail -f void1st@tylda.org $LOGIN@tylda.org < welcome.txt
+curl -X POST https://cloud.tylda.org/ocs/v1.php/cloud/users -d userid="$LOGIN" -d password="$PASS" -H "OCS-APIRequest: true" -u "$NEXTCLOUD_USER:$NEXTCLOUD_PASS"
+curl -X PUT "https://cloud.tylda.org/ocs/v1.php/cloud/users/$LOGIN" -H "OCS-APIRequest: true" -u "$NEXTCLOUD_USER:$NEXTCLOUD_PASS" -d key="quota" -d value="250MB"
+
+cp welcome_tmp.txt welcome.txt
+
+echo "Login: $LOGIN" >> welcome.txt
+echo "Hasło: $PASS" >> welcome.txt
+
+sendmail -f v0id1st@tylda.org $LOGIN@tylda.org < welcome.txt
+
+rm -f welcome.txt
 
 echo 524288000 > "$USER_CG/memory.max"     # 500 MB RAM
 echo "50000 100000" > "$USER_CG/cpu.max"        # 50 % CPU (quota/period μs)

welcome.txt

@@ -1,4 +0,0 @@
-Subject: Witaj na tylda.org!
-From: v0id1st@tylda.org
-
-Siemano :D

welcome_tmp.txt

@@ -0,0 +1,9 @@
+Subject: Witaj na tylda.org!
+From: v0id1st@tylda.org
+
+Siemano :D
+Witaj na tyldzie, baw się dobrze! Wpadnij się przywitać na IRCa.
+
+Twoje dane do Nextcloud to (https://cloud.tylda.org) to:
+
+