make sure nextcloud gets its password

also, echo instead of cat

active-users

@@ -0,0 +1,12 @@
+#!/usr/bin/php
+<?php
+$jsonFile = '/opt/html/online.json';
+
+$activeUsers = shell_exec("ps -eo user=,comm= | awk '$2 ~ /sshd/ {print $1}' | grep -vE 'sshd|root' | sort -u");
+
+$activeUsersArray = array_filter(explode("\n", $activeUsers));
+
+$activeUsersJson = json_encode($activeUsersArray, JSON_PRETTY_PRINT);
+
+file_put_contents($jsonFile, $activeUsersJson);
+?>

add_user.sh

@@ -7,11 +7,41 @@ set -e
 LOGIN="$1"
 [ -z "$LOGIN" ] && { echo "Użycie: $0 <login>"; exit 1; }
 
+STEP=$2
+PASS="$(openssl rand -base64 16 | sed 's/[\/\+\=\\]//g')"
+
+add_user() {
+    adduser -D -s /bin/sh -h "/home/$LOGIN" -H "$LOGIN"
+    echo "$LOGIN":"$PASS" | chpasswd
+    
+    zfs create -o mountpoint="/home/$LOGIN" -o quota=200M "tank/ROOT/homes/$LOGIN"
+    chown "$LOGIN":"$LOGIN" "/home/$LOGIN"
+}
+
+setup_user() {
+    addgroup "$LOGIN" tildeusers
+
+    # neomutt had issues with default vi
+    echo "export EDITOR=nvim" >> "/home/$LOGIN/.ashrc"
+
+    # set cgroup
+    CG_ROOT=/sys/fs/cgroup/users
+    mkdir -p "$CG_ROOT"
+    # upewnij się, że kontrolery włączone w parent „users”
+    echo "+cpu +memory" > "$CG_ROOT/cgroup.subtree_control" 2>/dev/null || true
+    
+    USER_CG="$CG_ROOT/$LOGIN"
+    mkdir "$USER_CG"
+    
+    # set default folders for ssh & gnu and set them private
+    mkdir -m 0700 "/home/$LOGIN/.ssh"
+    mkdir -m 0700 "/home/$LOGIN/.gnupg"
+}
+
 setup_neomutt () {
     for dir in "Inbox" "Sent" "Drafts" "Trash"; do
 	for subdir in "cur" "new" "tmp"; do
-	    # mkdir -p /home/"$LOGIN"/Maildir/$dir/$subdir
+	    mkdir -p "/home/$LOGIN/Maildir/$dir/$subdir"
-	    echo "$dir/$subdir"
 	done
     done
 
@@ -19,8 +49,8 @@ setup_neomutt () {
 }
 
 setup_tmux () {
-    mkdir -p /home/"$LOGIN"/.config/tmux
+    mkdir -p "/home/$LOGIN/.config/tmux"
-    cat << EOF > /home/"$LOGIN"/.config/tmux/tmux.conf
+    cat << EOF > "/home/$LOGIN/.config/tmux/tmux.conf"
 set -g mouse on
 setw -g mode-keys vi
 bind -n F1 select-window -t 0
@@ -37,6 +67,12 @@ if-shell "tmux has-session -t main 2>/dev/null" "detach" \
 
 set-hook -g client-attached "send-keys -t main:2 '/usr/local/bin/tylda-motd.sh' C-m"
 
+EOF
+
+cat << EOF > "/home/$LOGIN/.profile"
+if [ -z "\$TMUX" ]; then
+  exec tmux attach -t main || exec tmux new -s main
+fi
 EOF
 }
 
@@ -50,69 +86,69 @@ setup_gemini () {
 EOF
 }
 
-# 1. Użytkownik i hasło
+setup_html () {
-PASS="$(openssl rand -base64 16 | sed 's/[\/\+\=\\]//g')"
+    cp -r /root/helpers/public_html "/home/$LOGIN/"
-adduser -D -s /bin/sh -h "/home/$LOGIN" -H "$LOGIN"
+    sed -i "s/<<USER>>/$LOGIN/g" "/home/$LOGIN/"public_html/index.php
-echo "$LOGIN:$PASS" | chpasswd
+    sed -i "s/<<USER>>/$LOGIN/g" "/home/$LOGIN/"public_html/parts/header.php
-addgroup $LOGIN tildeusers
+    sed -i "s/<<USER>>/$LOGIN/g" "/home/$LOGIN/"public_html/blog/index.php
 
-# 2. Dataset ZFS  (quota 200 MB)
+    touch "/home/$LOGIN/public_html/.webring"
-zfs create -o mountpoint="/home/$LOGIN" -o quota=200M tank/ROOT/homes/$LOGIN
+}
-chown $LOGIN:$LOGIN /home/$LOGIN
-cat "export EDITOR=nvim" >> "/home/$LOGIN/.ashrc"
 
+setup_nextcloud () {
+    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"
 
-setup_neomutt
+    curl -X PUT "https://cloud.tylda.org/ocs/v1.php/cloud/users/$LOGIN" \
-setup_tmux
+	-H "OCS-APIRequest: true" \
-setup_gemini
+	-u "$NEXTCLOUD_USER:$NEXTCLOUD_PASS" \
+	-d key="quota" \
+	-d value="250MB"
+}
 
-cp -r /root/helpers/public_html "/home/$LOGIN/"
+setup_weechat () {
-sed -i "s/<<USER>>/$LOGIN/g" "/home/$LOGIN/"public_html/index.php
+    mkdir -p "/home/$LOGIN/.config/weechat/"
-sed -i "s/<<USER>>/$LOGIN/g" "/home/$LOGIN/"public_html/parts/header.php
+    cp /root/helpers/irc.conf "/home/$LOGIN/.config/weechat"
-sed -i "s/<<USER>>/$LOGIN/g" "/home/$LOGIN/"public_html/blog/index.php
+}
 
-mkdir -p "/home/$LOGIN/".config/weechat/
+send_welcome_mail () {
+    sendmail -f v0id1st@tylda.org "$LOGIN@tylda.org" << EOF
+Subject: Witaj na tylda.org!
+From: v0id1st@tylda.org
 
-cp /root/helpers/irc.conf "/home/$LOGIN/".config/weechat
+Siemano :D
+Witaj na tyldzie, baw się dobrze! Wpadnij się przywitać na IRCa.
 
-
+Twoje dane do Nextcloud to (https://cloud.tylda.org) to:
-cat << EOF > "/home/$LOGIN/.profile"
+    Login: $LOGIN
-if [ -z "\$TMUX" ]; then
+    Hasło: $PASS
-  exec tmux attach -t main || exec tmux new -s main
-fi
 EOF
+}
 
-
+if [ -z "$STEP" ]; then
-# 3. Cgroup v2
+	# critical path
-CG_ROOT=/sys/fs/cgroup/users
+	add_user
-mkdir -p "$CG_ROOT"
+	setup_user
-# upewnij się, że kontrolery włączone w parent „users”
+	setup_nextcloud
-echo "+cpu +memory" > "$CG_ROOT/cgroup.subtree_control" 2>/dev/null || true
+	send_welcome_mail
-
+	
-USER_CG="$CG_ROOT/$LOGIN"
+	# less important stuff
-mkdir "$USER_CG"
+	# shouldn't impact user obtaining registration email
-
+	setup_neomutt
-mkdir -p "/home/$LOGIN/.ssh"
+	setup_tmux
-mkdir -p "/home/$LOGIN/.gnupg"
+	setup_gemini
-touch "/home/$LOGIN/public_html/.webring"
+	setup_html
-
+	setup_weechat
-chmod 0700 "/home/$LOGIN/.ssh"
+else
-chmod 0700 "/home/$LOGIN/.gnupg"
+	# use $STEP as fn to call
+	$STEP
+fi
 
 chown -R "$LOGIN":"$LOGIN" "/home/$LOGIN/"
 
-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)