Run linter+formatter.
This commit is contained in:
parent
8fd1b6c982
commit
e2330f01fc
16 changed files with 58 additions and 54 deletions
|
@ -8,7 +8,7 @@ with lib;
|
|||
services = {
|
||||
gitea = let
|
||||
cfg = config.machine;
|
||||
domain = (findFirst (s: s.service == "gitea") cfg cfg.vHosts).domain;
|
||||
inherit ((findFirst (s: s.service == "gitea") cfg cfg.vHosts)) domain;
|
||||
in {
|
||||
enable = true;
|
||||
user = "git";
|
||||
|
|
|
@ -25,7 +25,7 @@ in
|
|||
|
||||
services = let
|
||||
cfg = config.machine;
|
||||
domain = (findFirst (s: s.service == "hydra") cfg cfg.vHosts).domain;
|
||||
inherit ((findFirst (s: s.service == "hydra") cfg cfg.vHosts)) domain;
|
||||
in {
|
||||
hydra = {
|
||||
enable = true;
|
||||
|
|
|
@ -14,7 +14,7 @@ with lib;
|
|||
// mkIf (elem "mailserver" config.machine.services) {
|
||||
mailserver = let
|
||||
cfg = config.machine;
|
||||
domain = cfg.domain;
|
||||
inherit (cfg) domain;
|
||||
fdomain = (findFirst (s: s.service == "mail") cfg cfg.vHosts).domain;
|
||||
mkFqdnAlias = name: ["${name}@${domain}" "${name}@${fdomain}"];
|
||||
mkExDomAlias = name: (map (exDom: "${name}@${exDom}") cfg.extraDomains);
|
||||
|
|
|
@ -9,7 +9,7 @@ with lib;
|
|||
mkIf (elem "nextcloud" config.machine.services) {
|
||||
services = let
|
||||
cfg = config.machine;
|
||||
domain = (findFirst (s: s.service == "nextcloud") cfg cfg.vHosts).domain;
|
||||
inherit ((findFirst (s: s.service == "nextcloud") cfg cfg.vHosts)) domain;
|
||||
in {
|
||||
nextcloud = {
|
||||
enable = true;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
...
|
||||
}:
|
||||
with lib;
|
||||
if (config.services.nextcloud.enable == true)
|
||||
if config.services.nextcloud.enable
|
||||
then
|
||||
{
|
||||
vHost = {
|
||||
|
|
|
@ -31,13 +31,12 @@ with lib;
|
|||
};
|
||||
# Add public keys to /etc/ssh/authorized_keys.d
|
||||
# This replaces users.users.*.openssh.authorizedKeys.*
|
||||
sops.secrets = (
|
||||
sops.secrets =
|
||||
fn.sopsHelper
|
||||
(user: "users/${user.name}/publicKey")
|
||||
config.machine.administrators
|
||||
(user: {
|
||||
path = "/etc/ssh/authorized_keys.d/${user.name}";
|
||||
mode = "444";
|
||||
})
|
||||
);
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue