danvics/selfhostblocks
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor pkgs in tests

Browse source
This commit is contained in:
ibizaman 2025-01-23 20:35:44 +01:00 committed by Pierre Penninckx
parent 072979fce2
commit b776bd07bc
11 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/common.nix
View file

@ -191,7 +191,7 @@ in
systemd.services.nginx.requires = [ config.shb.certs.certs.selfsigned.n.systemdService ]; systemd.services.nginx.requires = [ config.shb.certs.certs.selfsigned.n.systemdService ];
}; };
ldap = pkgs: { config, ... }: { ldap = { config, pkgs, ... }: {
imports = [ imports = [
../modules/blocks/ldap.nix ../modules/blocks/ldap.nix
]; ];
@ -221,7 +221,7 @@ in
}; };
}; };
sso = pkgs: ssl: { config, ... }: { sso = ssl: { config, pkgs, ... }: {
imports = [ imports = [
../modules/blocks/authelia.nix ../modules/blocks/authelia.nix
]; ];

6
test/services/arr.nix
View file

@ -1,7 +1,5 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
pkgs' = pkgs;
healthUrl = "/health"; healthUrl = "/health";
loginUrl = "/UI/Login"; loginUrl = "/UI/Login";
@ -130,8 +128,8 @@ let
testLib.certs testLib.certs
(basic appname) (basic appname)
(https appname) (https appname)
(testLib.ldap pkgs') testLib.ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
(sso appname) (sso appname)
]; ];
}; };

6
test/services/audiobookshelf.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
commonTestScript = testLib.accessScript { commonTestScript = testLib.accessScript {
@ -91,8 +89,8 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
sso sso
]; ];
}; };

6
test/services/deluge.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
commonTestScript = testLib.mkScripts { commonTestScript = testLib.mkScripts {
@ -182,8 +180,8 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
sso sso
]; ];
}; };

8
test/services/forgejo.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
adminPassword = "AdminPassword"; adminPassword = "AdminPassword";
@ -154,7 +152,7 @@ in
testLib.baseModule testLib.baseModule
../../modules/services/forgejo.nix ../../modules/services/forgejo.nix
basic basic
(testLib.ldap pkgs') testLib.ldap
ldap ldap
]; ];
}; };
@ -174,8 +172,8 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
sso sso
]; ];
}; };

6
test/services/hledger.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
adminPassword = "AdminPassword"; adminPassword = "AdminPassword";
@ -99,8 +97,8 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
sso sso
]; ];
}; };

4
test/services/home-assistant.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
commonTestScript = testLib.mkScripts { commonTestScript = testLib.mkScripts {
@ -165,7 +163,7 @@ in
testLib.baseModule testLib.baseModule
../../modules/services/home-assistant.nix ../../modules/services/home-assistant.nix
basic basic
(testLib.ldap pkgs') testLib.ldap
ldap ldap
]; ];
}; };

8
test/services/jellyfin.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
commonTestScript = testLib.mkScripts { commonTestScript = testLib.mkScripts {
@ -130,7 +128,7 @@ in
testLib.baseModule testLib.baseModule
../../modules/services/jellyfin.nix ../../modules/services/jellyfin.nix
basic basic
(testLib.ldap pkgs') testLib.ldap
ldap ldap
]; ];
}; };
@ -150,8 +148,8 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
sso sso
]; ];
}; };

2
test/services/monitoring.nix
View file

@ -1,7 +1,5 @@
{ pkgs, ... }: { pkgs, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
password = "securepw"; password = "securepw";

7
test/services/nextcloud.nix
View file

@ -1,6 +1,5 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
pkgs' = pkgs;
adminUser = "root"; adminUser = "root";
adminPass = "rootpw"; adminPass = "rootpw";
oidcSecret = "oidcSecret"; oidcSecret = "oidcSecret";
@ -332,7 +331,7 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
ldap ldap
]; ];
}; };
@ -352,9 +351,9 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
ldap ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
sso sso
]; ];
}; };

6
test/services/vaultwarden.nix
View file

@ -1,7 +1,5 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
let let
pkgs' = pkgs;
testLib = pkgs.callPackage ../common.nix {}; testLib = pkgs.callPackage ../common.nix {};
commonTestScript = testLib.mkScripts { commonTestScript = testLib.mkScripts {
@ -155,8 +153,8 @@ in
testLib.certs testLib.certs
basic basic
https https
(testLib.ldap pkgs') testLib.ldap
(testLib.sso pkgs' config.shb.certs.certs.selfsigned.n) (testLib.sso config.shb.certs.certs.selfsigned.n)
sso sso
]; ];
}; };