forked from Fediversity/Fediversity
spacing
This commit is contained in:
parent
33cfb9f211
commit
053fb3d3bf
1 changed files with 2 additions and 14 deletions
|
@ -8,9 +8,7 @@ let
|
|||
in
|
||||
{
|
||||
_class = "nixosTest";
|
||||
|
||||
name = "deployment-model";
|
||||
|
||||
sourceFileset = lib.fileset.unions [
|
||||
../../data-model.nix
|
||||
../../function.nix
|
||||
|
@ -21,11 +19,9 @@ in
|
|||
nodes.deployer =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
jq
|
||||
];
|
||||
|
||||
system.extraDependenciesFromModule =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
@ -46,30 +42,22 @@ in
|
|||
set -euo pipefail
|
||||
|
||||
# INSTANTIATE
|
||||
command=(
|
||||
nix-instantiate
|
||||
--expr
|
||||
|
||||
'
|
||||
command=(nix-instantiate --expr '
|
||||
let
|
||||
configuration = { pkgs, config, ... }: {
|
||||
imports = [
|
||||
${pathToRoot}/deployment/check/common/sharedOptions.nix
|
||||
${pathToRoot}/deployment/check/common/targetNode.nix
|
||||
];
|
||||
|
||||
enableAcme = ${lib.strings.toJSON config.enableAcme};
|
||||
acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
hello
|
||||
];
|
||||
};
|
||||
in
|
||||
import ${pathToRoot}/deployment/nixos.nix { inherit configuration; }
|
||||
'
|
||||
)
|
||||
|
||||
')
|
||||
# DEPLOY
|
||||
host="root@${nodeName}"
|
||||
sshOpts=(
|
||||
|
|
Loading…
Add table
Reference in a new issue