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

deploy cleanup

Browse source
This commit is contained in:
arcnmx 2023-03-11 13:36:51 -08:00
parent 8f611f02be
commit 81f98593a2
3 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.envrc
View file

@ -1,8 +1,11 @@
if [[ $(id -un) = kat ]]; then
export TRUSTED=1
git pull
fi
export NF_CONFIG_ROOT=$PWD
export HOME_HOSTNAME=$(hostname -s)
if [[ $(id -un) = kat ]]; then
git pull
fi
if [[ -e trusted/trusted/flake.nix ]]; then
export TRUSTED=1
fi
use nix

9
devShell.nix
View file

@ -7,20 +7,15 @@ let
inherit (lib.options) optional;
inherit (lib.attrsets) attrValues;
nf-actions = pkgs.writeShellScriptBin "nf-actions" ''
export START_DIR="$PWD"
cd "${toString ./.}"
export NF_CONFIG_ROOT=${toString ./.}/ci
NF_CONFIG_FILES=($NF_CONFIG_ROOT/{nodes,flake-cron}.nix)
for f in "''${NF_CONFIG_FILES[@]}"; do
echo $f
nix run --argstr config "$f" -f '${inputs.ci}' run.gh-actions-generate
done
cd $START_DIR
'';
nf-actions-test = pkgs.writeShellScriptBin "nf-actions-test" ''
export START_DIR="$PWD"
cd "${toString ./.}"
export NF_CONFIG_ROOT=${toString ./.}/ci
nix run --argstr config "$NF_CONFIG_ROOT/nodes.nix" -f '${inputs.ci}' job.tewi.test
'';
nf-update = pkgs.writeShellScriptBin "nf-update" ''
@ -30,7 +25,6 @@ let
fi
'';
nf-deploy = pkgs.writeShellScriptBin "nf-deploy" ''
export NF_CONFIG_ROOT=${toString ./.}
exec /usr/bin/env bash ${./nixos/deploy.sh} "$@"
'';
in
@ -48,7 +42,8 @@ pkgs.mkShell {
export HOME_UID=$(id -u)
export HOME_USER=$(id -un)
export CI_PLATFORM="impure"
export NIX_PATH="$NIX_PATH:home=${toString ./.}"
export NF_CONFIG_ROOT=''${NF_CONFIG_ROOT-${toString ./.}}
export NIX_PATH="$NIX_PATH:home=$NF_CONFIG_ROOT"
'';
}

28
nixos/deploy.sh
View file

@ -15,37 +15,41 @@ if [[ -e trusted/trusted/flake.nix ]]; then
)
fi
NIXOS_HOST=tewi
NIXOS_TOPLEVEL=network.nodes.nixos.$NIXOS_HOST.system.build.toplevel
NF_HOST=${NF_HOST-tewi}
NIXOS_TOPLEVEL=network.nodes.nixos.$NF_HOST.system.build.toplevel
if [[ $1 = build ]]; then
exec nix build --no-link --print-out-paths $NF_CONFIG_ROOT#$NIXOS_TOPLEVEL "${TRUSTED_ARGS[@]}"
exec nix build --no-link --print-out-paths $NF_CONFIG_ROOT\#$NIXOS_TOPLEVEL "${TRUSTED_ARGS[@]}"
elif [[ $1 = switch ]] || [[ $1 = test ]] || [[ $1 = dry-* ]]; then
METHOD=$1
shift
exec nixos-rebuild $METHOD \
--flake $NF_CONFIG_ROOT#$NIXOS_HOST "${TRUSTED_ARGS[@]}" \
--flake $NF_CONFIG_ROOT\#$NF_HOST "${TRUSTED_ARGS[@]}" \
--no-build-nix \
--target-host $NIXOS_HOST --use-remote-sudo \
--target-host $NF_HOST --use-remote-sudo \
"$@"
elif [[ $1 = check ]]; then
DEFAULT=$(nix eval --raw -f $NF_CONFIG_ROOT $NIXOS_TOPLEVEL)
FLAKE=$(nix eval --raw $NF_CONFIG_ROOT#$NIXOS_TOPLEVEL)
EXIT_CODE=0
DEFAULT=$(TRUSTED= nix eval --raw -f $NF_CONFIG_ROOT $NIXOS_TOPLEVEL)
FLAKE=$(nix eval --raw $NF_CONFIG_ROOT\#$NIXOS_TOPLEVEL)
if [[ $DEFAULT != $FLAKE ]]; then
echo default.nix: $DEFAULT
echo flake.nix: $FLAKE
exit 1
fi
EXIT_CODE=1
else
echo untrusted ok: $FLAKE
fi
TRUSTED=$(TRUSTED=1 nix eval --raw -f $NF_CONFIG_ROOT $NIXOS_TOPLEVEL)
TRUSTED_FLAKE=$(nix eval --raw $NF_CONFIG_ROOT#$NIXOS_TOPLEVEL "${TRUSTED_ARGS[@]}")
TRUSTED_FLAKE=$(nix eval --raw $NF_CONFIG_ROOT\#$NIXOS_TOPLEVEL "${TRUSTED_ARGS[@]}")
if [[ $TRUSTED != $TRUSTED_FLAKE ]]; then
echo TRUSTED=1 default.nix: $TRUSTED
echo trusted/flake.nix: $TRUSTED_FLAKE
exit 1
fi
EXIT_CODE=1
else
echo trusted ok: $TRUSTED_FLAKE
fi
exit $EXIT_CODE
else
echo unknown cmd $1 >&2
exit 1