mirror of
https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git
synced 2025-12-15 11:22:43 +03:00
Implement system in users
Makes the created user a system user
This commit is contained in:
parent
0faaee62a4
commit
69c9545144
@ -270,7 +270,7 @@ in_list() {
|
|||||||
init__userdata_users() {
|
init__userdata_users() {
|
||||||
local users="$(get_userdata users)"
|
local users="$(get_userdata users)"
|
||||||
for i in $users; do
|
for i in $users; do
|
||||||
local name gecos homedir shell lock_passwd=true
|
local name gecos homedir shell system=false lock_passwd=true
|
||||||
local keys="$(get_userdata users/$i)"
|
local keys="$(get_userdata users/$i)"
|
||||||
if [ "$i" = 1 ] && [ "$keys" = "default" ]; then
|
if [ "$i" = 1 ] && [ "$keys" = "default" ]; then
|
||||||
continue
|
continue
|
||||||
@ -289,10 +289,17 @@ init__userdata_users() {
|
|||||||
if in_list shell $keys; then
|
if in_list shell $keys; then
|
||||||
shell="$(get_userdata users/$i/shell)"
|
shell="$(get_userdata users/$i/shell)"
|
||||||
fi
|
fi
|
||||||
|
if in_list system $keys; then
|
||||||
|
system="$(get_userdata users/$i/system)"
|
||||||
|
fi
|
||||||
|
|
||||||
if getent passwd "$user" >/dev/null; then
|
if getent passwd "$user" >/dev/null; then
|
||||||
log -i -t "$phase" info "$ACTION: user $user already exists"
|
log -i -t "$phase" info "$ACTION: user $user already exists"
|
||||||
else
|
else
|
||||||
$MOCK adduser -D ${gecos:+-g "$gecos"} ${homedir:+-h "$homedir"} ${shell:+-s "$shell"} "$name"
|
if [ "$system" != "true" ]; then
|
||||||
|
unset system
|
||||||
|
fi
|
||||||
|
$MOCK adduser -D ${gecos:+-g "$gecos"} ${homedir:+-h "$homedir"} ${shell:+-s "$shell"} ${system:+-S} "$name"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if in_list lock_passwd $keys; then
|
if in_list lock_passwd $keys; then
|
||||||
|
|||||||
@ -22,6 +22,7 @@ init_tests \
|
|||||||
userdata_users_gecos \
|
userdata_users_gecos \
|
||||||
userdata_users_homedir \
|
userdata_users_homedir \
|
||||||
userdata_users_shell \
|
userdata_users_shell \
|
||||||
|
userdata_users_system \
|
||||||
userdata_users_lock_passwd \
|
userdata_users_lock_passwd \
|
||||||
userdata_users_ssh_authorized_keys \
|
userdata_users_ssh_authorized_keys \
|
||||||
userdata_ssh_authorized_keys \
|
userdata_ssh_authorized_keys \
|
||||||
@ -247,6 +248,22 @@ userdata_users_shell_body() {
|
|||||||
tiny-cloud main
|
tiny-cloud main
|
||||||
}
|
}
|
||||||
|
|
||||||
|
userdata_users_system_body() {
|
||||||
|
# first specified user will replace default user
|
||||||
|
fake_userdata_nocloud <<-EOF
|
||||||
|
#alpine-config
|
||||||
|
users:
|
||||||
|
- default
|
||||||
|
- name: foo
|
||||||
|
system: true
|
||||||
|
EOF
|
||||||
|
atf_check -e ignore -o ignore tiny-cloud early
|
||||||
|
atf_check \
|
||||||
|
-e match:"userdata_users: done" \
|
||||||
|
-o match:"adduser.*-S.*foo" \
|
||||||
|
tiny-cloud main
|
||||||
|
}
|
||||||
|
|
||||||
userdata_users_lock_passwd_body() {
|
userdata_users_lock_passwd_body() {
|
||||||
# first specified user will replace default user
|
# first specified user will replace default user
|
||||||
fake_userdata_nocloud <<-EOF
|
fake_userdata_nocloud <<-EOF
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user