gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

deploy script fixes

Browse source
This commit is contained in:
kat witch 2021-03-25 04:27:47 +00:00
parent 2130bc297b
commit 323322f339
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/deploy.nix
View file

@ -12,7 +12,7 @@ with pkgs.lib;
}
${concatMapStrings (host: ''
echo "deploying ${host.config.networking.hostName}..."
${host.config.system.build.deployScript} $1 &
${host.config.system.build.deployScript}
PID_LIST+=" $!"
'') hosts}
# FIXME: remove jobs from PIDLIST once they finish

5
modules/nixos/deploy/default.nix
View file

@ -11,14 +11,13 @@ let
}
cat > ${file.path}
chmod ${file.mode} ${file.path}
chown ${file.owner}:${file.group} ${file.path}"''
chown ${file.owner}:${file.group} ${file.path}"''
+ (if file.source != null then ''
< ${toString file.source}
'' else ''
<<${if hasPrefix "__FUCKERY__" file.text then "EOF" else "'EOF'"}
${removePrefix "__FUCKERY__" file.text}
EOF
'')) (attrValues config.secrets.files);
EOF'')) (attrValues config.secrets.files);
in {
options = {
deploy = {