bryan/hartman-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve user script prompts

Browse Source
This commit is contained in:
Bryan Roessler
2024-06-30 14:29:16 -04:00
parent 270b7f2a38
commit ca6d3d4dcb
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
script-user-add
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Add a user to the Hartman Lab server # Add a user to the Hartman Lab server
# Copyright 2021 Bryan C. Roessler # Copyright Bryan C. Roessler
parent="${BASH_SOURCE[0]}" parent="${BASH_SOURCE[0]}"
parent=${parent%/*} parent=${parent%/*}
@@ -9,17 +9,26 @@ parent=${parent%/*}
is_root is_root
echo "$@" echo "This script supports two optional arguments, a username and password"
[[ $# -eq 0 ]] && echo "No username provided!" && exit 1 if [[ $# -eq 0 ]]; then
[[ $# -eq 1 ]] && username="$1" && password="$username" prompt username
[[ $# -eq 2 ]] && username="$1" && password="$2" prompt password
[[ $# -gt 2 ]] && echo "Too many arguments provided" && exit 1 elif [[ $# -eq 1 ]]; then
username="$1"
prompt password
elif [[ $# -eq 2 ]]; then
username="$1"
password="$2"
elif [[ $# -gt 2 ]]; then
echo "Too many arguments provided"
exit 1
fi
useradd_cmd=("useradd" "-m" "-U") useradd_cmd=(useradd -m -U)
if id -u "$username"; then if id -u "$username" &>/dev/null; then
ask_ok "User $username exists. Run script-user-remove?" || exit $? ask_ok "User $username exists. Run script-user-remove first?" || exit $?
"$parent"/script-user-remove "$username" || exit $? "$parent"/script-user-remove "$username" || exit $?
fi fi
@@ -33,7 +42,7 @@ fi
samba="no" samba="no"
ask_ok "Enable shared file access for user $username?" && group_str="smbgrp" && samba="yes" ask_ok "Enable shared file access for user $username?" && group_str="smbgrp" && samba="yes"
ask_ok "Make user $username an admin?" && \ ask_ok "Make $username an admin?" && \
group_str+=",wheel" group_str+=",wheel"
useradd_cmd+=("-G" "$group_str") useradd_cmd+=("-G" "$group_str")
@@ -54,15 +63,16 @@ if [[ "$samba" == "yes" ]]; then
(echo "$password"; echo "$password") | smbpasswd -a -s "$username" (echo "$password"; echo "$password") | smbpasswd -a -s "$username"
fi fi
# TODO check if centos 9 does by default
# Add subuids & subgids for container namespace # Add subuids & subgids for container namespace
id_offset=100000 # id_offset=100000
id_num=65536 # id_num=65536
last_uid=$(tail -1 /etc/subuid | cut -d':' -f2) # last_uid=$(tail -1 /etc/subuid | cut -d':' -f2)
last_gid=$(tail -1 /etc/subgid | cut -d':' -f2) # last_gid=$(tail -1 /etc/subgid | cut -d':' -f2)
start_uid=$(( last_uid + id_offset )) # start_uid=$(( last_uid + id_offset ))
start_gid=$(( last_gid + id_offset )) # start_gid=$(( last_gid + id_offset ))
echo "$username:$start_uid:$id_num" >> /etc/subuid # echo "$username:$start_uid:$id_num" >> /etc/subuid
echo "$username:$start_gid:$id_num" >> /etc/subgid # echo "$username:$start_gid:$id_num" >> /etc/subgid
# Copy manual to user desktop # Copy manual to user desktop
mkdir -p /home/"$username"/Desktop/ mkdir -p /home/"$username"/Desktop/

5
script-user-remove
View File

@@ -11,11 +11,12 @@ unset user
is_root is_root
echo "This script supports one optional argument, a username"
if [[ $# -eq 1 ]]; then if [[ $# -eq 1 ]]; then
user="$1" user="$1"
else else
echo "Must provide exactly one argument (username)" prompt user
exit 1
fi fi
if ! id -u "$user"; then if ! id -u "$user"; then