YunoHost-Apps/ztncui_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/ztncui_ynh.git synced 2024-09-03 18:06:05 +02:00
Code Issues Activity Actions

[fix] proper path to argon2-cli

Browse source
This commit is contained in:
tituspijean 2020-04-18 15:33:31 +02:00
parent ea93407686
commit 35d8edd4c8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/install
View file

@ -158,7 +158,7 @@ chown -R $app: $final_path
pushd $final_path/src
exec_as $app $nodejs_path/npm --loglevel=error install node-gyp
exec_as $app $nodejs_path/npm --loglevel=error install
exec_as $app $nodejs_path/npm --loglevel=error install argon-cli
exec_as $app $nodejs_path/npm --loglevel=error install argon2-cli
exec_as $app $nodejs_path/npm --loglevel=error audit fix
popd
@ -177,7 +177,7 @@ echo "ZT_ADDR=localhost:$(</var/lib/zerotier-one/zerotier-one.port)" >> $env_fil
echo "HTTP_PORT=$port" >> $env_file
# Setup user credentials file
hashedpassword=$(echo -n "$password" | argon2-cli -e)
hashedpassword=$(echo -n "$password" | $final_path/src/node_modules/.bin/argon2-cli -e)
echo "{\"$admin\":{\"name\":\"$admin\",\"pass_set\":true,\"hash\":\"$hashedpassword\"}}" >> "$final_path/src/etc/passwd"
# Store user settings

4
scripts/upgrade
View file

@ -138,7 +138,7 @@ chown -R $app: $final_path
pushd $final_path/src
exec_as $app $nodejs_path/npm --loglevel=error install node-gyp
exec_as $app $nodejs_path/npm --loglevel=error install
exec_as $app $nodejs_path/npm --loglevel=error install argon-cli
exec_as $app $nodejs_path/npm --loglevel=error install argon2-cli
exec_as $app $nodejs_path/npm --loglevel=error audit fix
popd
@ -157,7 +157,7 @@ echo "ZT_ADDR=localhost:$(</var/lib/zerotier-one/zerotier-one.port)" >> $env_fil
echo "HTTP_PORT=$port" >> $env_file
# Setup user credentials file
hashedpassword=$(echo -n "$password" | argon2-cli -e)
hashedpassword=$(echo -n "$password" | $final_path/src/node_modules/argon2-cli -e)
echo "{\"$admin\":{\"name\":\"$admin\",\"pass_set\":true,\"hash\":\"$hashedpassword\"}}" >> "$final_path/src/etc/passwd"
#=================================================