SelfPrivacy/selfprivacy-nixos-infect
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-infect.git synced 2024-11-29 06:31:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request 'Moved hash generation engine to the backend' (#9) from development into preproduction

Browse source 
Reviewed-on: https://git.selfprivacy.org/ilchub/selfprivacy-nixos-infect/pulls/9
This commit is contained in:
ilchub 2021-04-21 13:02:31 +03:00
parent cef67aa31f 5e7fd4869b
commit e446e63140
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos-infect
View file

@ -5,6 +5,7 @@
set -e -o pipefail set -e -o pipefail
makeConf() { makeConf() {
export HASHED_PASSWORD=$( mkpasswd -m sha-512 "$PASSWORD" )
# Skip everything if main config already present # Skip everything if main config already present
[[ -e /etc/nixos/configuration.nix ]] && return 0 [[ -e /etc/nixos/configuration.nix ]] && return 0
# NB <<"EOF" quotes / $ ` in heredocs, <<EOF does not # NB <<"EOF" quotes / $ ` in heredocs, <<EOF does not
@ -118,7 +119,7 @@ makeConf() {
users.users = { users.users = {
"$LUSER" = { "$LUSER" = {
isNormalUser = true; isNormalUser = true;
hashedPassword = "\$6\$$SALT\$$HASHED_PASSWORD"; hashedPassword = "$HASHED_PASSWORD";
}; };
}; };
} }
@ -1319,7 +1320,7 @@ infect() {
[ "$PROVIDER" = "digitalocean" ] && doNetConf=y # digitalocean requires detailed network config to be generated [ "$PROVIDER" = "digitalocean" ] && doNetConf=y # digitalocean requires detailed network config to be generated
apt update apt update
apt install -y git apt install -y git whois
prepareEnv prepareEnv
makeSwap # smallest (512MB) droplet needs extra memory! makeSwap # smallest (512MB) droplet needs extra memory!
checkEnv checkEnv