fricklerhandwerk/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

WIP: test data model thru VM #11

Closed
kiara wants to merge 70 commits from data-model-test-deployment-plain into deployment-data-model-with-tests
pull from: data-model-test-deployment-plain
merge into: fricklerhandwerk:deployment-data-model-with-tests
Conversation 2 Commits 70 Files changed 22 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1048ac674e - Show all commits

6
deployment/data-model-test.nix
View file

@ -151,7 +151,7 @@ in
}
);
resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello;
hello-shell = (resources).resources.hello.login-shell;
hello-shell = resources.resources.hello.login-shell;
environment = fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell;
result = mkDeployment {
modules = [
@ -160,7 +160,7 @@ in
};
in
rec {
{
number-of-resources = with lib; length (attrNames fediversity.resources);
inherit (fediversity) example-configuration;
hello-package-exists = hello-shell.packages ? hello;
@ -172,7 +172,7 @@ in
in
{
inherit (operator) isNormalUser;
packages = with lib; map (p: "${p.pname}") operator.packages;
packages = map (p: "${p.pname}") operator.packages;
extraGroups = operator.extraGroups;
};
deployment = {

2
deployment/data-model.nix
View file

@ -73,7 +73,7 @@ in
# and then also rename this to be consistent with the application's resource mapping
options.apply = mkOption {
description = "Apply the policy to a request";
type = with types; functionTo policy.config.resource-type;
type = functionTo policy.config.resource-type;
};
})
];