evolix/evoadmin-web
22
0
Fork 1
Code Issues 33 Pull requests 4 Releases 1 Wiki Activity

Fix #19 - Do not enforce md5 for password

Browse source
This commit is contained in:
Ludovic Poujol 2019-02-28 16:19:54 +01:00
parent a52846c977
commit 2935b771cb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/web-add-nginx.sh
View file

@ -199,7 +199,7 @@ create_www_account() {
/usr/sbin/adduser --gecos "User $in_login" --disabled-password "$in_login" \
--shell /bin/bash $OPT_UID $OPT_UID_ARG --force-badname \
--home "$HOME_DIR_USER" >/dev/null
[ -z "$in_sshkey" ] && echo "$in_login:$in_passwd" | chpasswd --md5
[ -z "$in_sshkey" ] && echo "$in_login:$in_passwd" | chpasswd
[ -z "$in_sshkey" ] || [ -n "$HOME_DIR_USER" ] \
&& mkdir "$HOME_DIR_USER/.ssh" \
&& echo "$in_sshkey" > "$HOME_DIR_USER/.ssh/authorized_keys" \

6
scripts/web-add.sh
View file

@ -263,8 +263,8 @@ create_www_account() {
--home "$HOME_DIR_USER" >/dev/null
[ -z "$in_sshkey" ] \
&& echo "$in_login:$in_passwd" | chpasswd --md5
&& echo "$in_login:$in_passwd" | chpasswd
[ -z "$in_sshkey" ] \
|| [ -n "$HOME_DIR_USER" ] \
&& mkdir "$HOME_DIR_USER/.ssh" \
@ -300,7 +300,7 @@ create_www_account() {
for php_version in "${PHP_VERSIONS[@]}"; do
lxc-attach -n php"${php_version}" -- /usr/sbin/addgroup "$in_login" --gid "$gid" --force-badname >/dev/null
lxc-attach -n php"${php_version}" -- /usr/sbin/adduser --gecos "User $in_login" --disabled-password "$in_login" --shell /bin/bash --uid "$uid" --gid "$gid" --force-badname --home "$HOME_DIR_USER" >/dev/null
lxc-attach -n php"${php_version}" -- [ -z "$in_sshkey" ] && echo "$in_login:$in_passwd" | chpasswd --md5
lxc-attach -n php"${php_version}" -- [ -z "$in_sshkey" ] && echo "$in_login:$in_passwd" | chpasswd
lxc-attach -n php"${php_version}" -- /usr/sbin/adduser --disabled-password --home "$HOME_DIR_USER"/www --no-create-home --shell /bin/false --gecos "WWW $in_login" www-"$in_login" --uid "$www_uid" --ingroup "$in_login" --force-badname >/dev/null
done