forked from DGNum/infrastructure
chore(nixfmt): Format all files since nixfmt version changed
This commit is contained in:
parent
380f629b0e
commit
d7622f4d8f
4 changed files with 31 additions and 28 deletions
|
@ -178,7 +178,8 @@ in
|
|||
devShell = pkgs.mkShell {
|
||||
name = "dgnum-infra";
|
||||
|
||||
packages = [
|
||||
packages =
|
||||
[
|
||||
(pkgs.nixos-generators.overrideAttrs (_: {
|
||||
version = "1.8.0-unstable";
|
||||
src = sources.nixos-generators;
|
||||
|
@ -195,7 +196,9 @@ in
|
|||
})
|
||||
(pkgs.callPackage "${sources.agenix}/pkgs/agenix.nix" { })
|
||||
(pkgs.callPackage "${sources.lon}/nix/packages/lon.nix" { })
|
||||
] ++ git-checks.enabledPackages ++ (builtins.attrValues scripts);
|
||||
]
|
||||
++ git-checks.enabledPackages
|
||||
++ (builtins.attrValues scripts);
|
||||
|
||||
shellHook = builtins.concatStringsSep "\n" [
|
||||
git-checks.shellHook
|
||||
|
|
|
@ -2,6 +2,8 @@
|
|||
#
|
||||
# SPDX-License-Identifier: EUPL-1.2
|
||||
|
||||
(import ../../../../keys).mkSecrets [ "build01" ] [
|
||||
(import ../../../../keys).mkSecrets
|
||||
[ "build01" ]
|
||||
[
|
||||
"forgejo_runners-token_file"
|
||||
]
|
||||
]
|
||||
|
|
|
@ -285,15 +285,13 @@ in
|
|||
];
|
||||
script = ''
|
||||
if ping -c 1 8.8.8.8 > /dev/null || ping -c 1 1.1.1.1 > /dev/null; then
|
||||
${
|
||||
lib.concatMapStringsSep "\n " ({ interfaceName, ... }: "networkctl up ${interfaceName}") userVlans
|
||||
}
|
||||
${lib.concatMapStringsSep "\n " (
|
||||
{ interfaceName, ... }: "networkctl up ${interfaceName}"
|
||||
) userVlans}
|
||||
else
|
||||
${
|
||||
lib.concatMapStringsSep "\n " (
|
||||
${lib.concatMapStringsSep "\n " (
|
||||
{ interfaceName, ... }: "networkctl down ${interfaceName}"
|
||||
) userVlans
|
||||
}
|
||||
) userVlans}
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue