Merge pull request #455 from YunoHost/enh_ynh_system_user_create_with_login_shell

[enh] Control the login shell when creating users in ynh_system_user_create
This commit is contained in:
Alexandre Aubin 2019-01-27 15:58:27 +01:00 committed by GitHub
commit 0bc8300b88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -41,18 +41,41 @@ ynh_system_user_exists() {
# Create a system user # Create a system user
# #
# usage: ynh_system_user_create user_name [home_dir] # examples:
# | arg: user_name - Name of the system user that will be create # - ynh_system_user_create --username=nextcloud -> creates a nextcloud user with
# | arg: home_dir - Path of the home dir for the user. Usually the final path of the app. If this argument is omitted, the user will be created without home # no home directory and /usr/sbin/nologin login shell (hence no login capability)
# - ynh_system_user_create --username=discourse --home_dir=/var/www/discourse --use_shell --> creates a
# discourse user using /var/www/discourse as home directory and the default login shell
#
# usage: ynh_system_user_create --username=user_name [--home_dir=home_dir] [--use_shell]
# | arg: -u, --username - Name of the system user that will be create
# | arg: -h, --home_dir - Path of the home dir for the user. Usually the final path of the app. If this argument is omitted, the user will be created without home
# | arg: -s, --use_shell - Create a user using the default login shell if present.
# If this argument is omitted, the user will be created with /usr/sbin/nologin shell
ynh_system_user_create () { ynh_system_user_create () {
if ! ynh_system_user_exists "$1" # Check if the user exists on the system # Declare an array to define the options of this helper.
local legacy_args=uh
declare -Ar args_array=( [u]=username= [h]=home_dir= [s]=use_shell )
local username
local home_dir
local use_shell
# Manage arguments with getopts
ynh_handle_getopts_args "$@"
local use_shell="${use_shell:-0}"
if ! ynh_system_user_exists "$username" # Check if the user exists on the system
then # If the user doesn't exist then # If the user doesn't exist
if [ $# -ge 2 ]; then # If a home dir is mentioned if [ -n "$home_dir" ]; then # If a home dir is mentioned
local user_home_dir="-d $2" local user_home_dir="-d $home_dir"
else else
local user_home_dir="--no-create-home" local user_home_dir="--no-create-home"
fi fi
sudo useradd $user_home_dir --system --user-group $1 --shell /usr/sbin/nologin || ynh_die "Unable to create $1 system account" if [ $use_shell -eq 1 ]; then # If we want a shell for the user
local shell="" # Use default shell
else
local shell="--shell /usr/sbin/nologin"
fi
useradd $user_home_dir --system --user-group $username $shell || ynh_die "Unable to create $username system account"
fi fi
} }