add ssh key and create nextcloud user

Co-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
@@ -31,6 +33,8 @@ mkdir -p /home/$LOGIN/Maildir/Trash/cur
 mkdir -p /home/$LOGIN/Maildir/Trash/new
 mkdir -p /home/$LOGIN/Maildir/Trash/tmp
 
+chmod -R 0700 /home/$LOGIN/Maildir
+
 cp -r /root/helpers/public_html /home/$LOGIN/
 sed -i "s/<<USER>>/$LOGIN/g" /home/$LOGIN/public_html/index.php
 sed -i "s/<<USER>>/$LOGIN/g" /home/$LOGIN/public_html/parts/header.php
@@ -38,35 +42,34 @@ sed -i "s/<<USER>>/$LOGIN/g" /home/$LOGIN/public_html/blog/index.php
 
 mkdir -p /home/$LOGIN/.config/weechat/
 
-cp irc.conf /home/$LOGIN/.config/weechat
+cp /root/helpers/irc.conf /home/$LOGIN/.config/weechat
 
-cat << EOF > /home/$LOGIN/.tmux.conf
+mkdir -p /home/$LOGIN/.config/tmux
+cat << EOF > /home/$LOGIN/.config/tmux/tmux.conf
 set -g mouse on
 setw -g mode-keys vi
 bind -n F1 select-window -t 0
 bind -n F2 select-window -t 1
 bind -n F3 select-window -t 2
 bind -n F12 detach
+
+if-shell "tmux has-session -t main 2>/dev/null" "detach" \
+  "new-session -d -s main -n Mail 'neomutt'; \
+   new-window -t main:1 -n IRC 'weechat'; \
+   new-window -t main:2 -n Shell 'ash'; \
+   send-keys -t main:2 '/usr/local/bin/tylda-motd.sh' C-m; \
+   select-window -t main:0"
+
+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
+if [ -z "\$TMUX" ]; then
-    if ! tmux has-session -t main 2>/dev/null; then
+  exec tmux attach -t main || exec tmux new -s main
-        tmux new-session -d -s main -n Mail 'neomutt'
-        tmux new-window -t main:1 -n IRC 'weechat'
-        tmux new-window -t main:2 -n Shell 'ash'
-    fi
-
-    # Uruchom motd tylko gdy user wchodzi do Shell – okno 2
-    tmux send-keys -t main:2 '/usr/local/bin/tylda-motd.sh' C-m
-
-    tmux select-window -t main:0
-    exec tmux attach-session -t main
 fi
 EOF
 
-chown -R $LOGIN:$LOGIN /home/$LOGIN/
-
 
 # 3. Cgroup v2
 CG_ROOT=/sys/fs/cgroup/users
@@ -77,7 +80,35 @@ echo "+cpu +memory" > "$CG_ROOT/cgroup.subtree_control" 2>/dev/null || true
 USER_CG="$CG_ROOT/$LOGIN"
 mkdir "$USER_CG"
 
-sendmail -f void@tylda.org $LOGIN@tylda.org < welcome.txt
+# gemini
+gmi="/home/$LOGIN/public_gemini"
+mkdir -p $gmi
+ln -s $gmi /srv/gemini/~$LOGIN
+
+cat <<EOF > $gmi/index.gmi
+# $LOGIN
+EOF
+# end gemini
+
+chown -R $LOGIN:$LOGIN /home/$LOGIN/
+
+mkdir -p /home/$LOGIN/.ssh
+mkdir -p /home/$LOGIN/.gnupg
+
+chmod 0700 /home/$LOGIN/.ssh
+chmod 0700 /home/$LOGIN/.gnupg
+
+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)

del_user.sh

@@ -27,7 +27,7 @@ sleep 1  # Dajmy kernelowi chwilę na posprzątanie
 # === REMOVE FROM CGROUPS ===
 echo "[i] Odłączam procesy z cgroup (jeśli coś zostało)..."
 
-rmdir "/sys/fs/cgroup/users/${USERNAME}"
+[ -d "/sys/fs/cgroup/users/${USERNAME}" ] && rmdir "/sys/fs/cgroup/users/${USERNAME}" 
 
 # === UNMOUNT HOME DIR ===
 ZFS_DATASET="${HOMES_DATASET}/${USERNAME}"

snapshots.sh

@@ -0,0 +1,6 @@
+#!/bin/ash
+
+for u in $(ls /home); do
+  zfs snapshot tank/ROOT/homes/$u@$(date "+%Y%m%d")
+  zfs destroy tank/ROOT/homes/$u@$(date --date="-5 days" "+%Y%m%d")
+done

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:
+
+