Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-04-04 11:10:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated nix for 22.11 (4)

Browse source
This commit is contained in:
Julien Malka 2023-01-05 17:15:06 +01:00
parent 3b57581c17
commit f6862a1944
Signed by: Luj
GPG key ID: 6FC74C847011FD83
2 changed files with 81 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/bincache/default.nix
View file

@ -18,7 +18,7 @@ with lib;
users.users.nix-serve = { users.users.nix-serve = {
isSystemUser = true; isSystemUser = true;
}; };
nix.allowedUsers = [ "nix-serve" ]; nix.settings.allowed-users = [ "nix-serve" ];
users.users.nix-serve.group = "nix-serve"; users.users.nix-serve.group = "nix-serve";
users.groups.nix-serve = { }; users.groups.nix-serve = { };
@ -32,5 +32,6 @@ with lib;
port = port; port = port;
}; };
} (mkSubdomain cfg.subdomain port)); }
(mkSubdomain cfg.subdomain port));
} }

9
modules/drone/default.nix
View file

@ -14,7 +14,8 @@ in
}; };
}; };
config = mkIf cfg.enable (recursiveUpdate { config = mkIf cfg.enable (recursiveUpdate
{
users.users.drone = { users.users.drone = {
isNormalUser = true; isNormalUser = true;
@ -25,7 +26,7 @@ in
}; };
users.groups.drone = { }; users.groups.drone = { };
luj.hmgr.drone.luj.programs.git.enable = true; luj.hmgr.drone.luj.programs.git.enable = true;
nix.allowedUsers = [ drone ]; nix.settings.allowed-users = [ drone ];
sops.secrets.drone = { }; sops.secrets.drone = { };
@ -57,6 +58,7 @@ in
"DRONE_DATABASE_DRIVER=postgres" "DRONE_DATABASE_DRIVER=postgres"
"DRONE_SERVER_PORT=:3030" "DRONE_SERVER_PORT=:3030"
"DRONE_USER_CREATE=username:JulienMalka,admin:true" "DRONE_USER_CREATE=username:JulienMalka,admin:true"
"DRONE_USER_CREATE=username:camillemndn, admin:true"
"DRONE_REGISTRATION_CLOSED=true" "DRONE_REGISTRATION_CLOSED=true"
]; ];
ExecStart = "${pkgs.drone}/bin/drone-server"; ExecStart = "${pkgs.drone}/bin/drone-server";
@ -94,5 +96,6 @@ in
path = [ pkgs.nixUnstable pkgs.git pkgs.openssh ]; path = [ pkgs.nixUnstable pkgs.git pkgs.openssh ];
}; };
} (recursiveUpdate (mkSubdomain cfg.subdomain port) (mkVPNSubdomain cfg.subdomain port))); }
(recursiveUpdate (mkSubdomain cfg.subdomain port) (mkVPNSubdomain cfg.subdomain port)));
} }