sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modules/nixos/hydra: drop options

Browse source
This commit is contained in:
zowoq 2023-12-07 09:53:36 +10:00
parent 18890baf28
commit 57f607814c
1 changed files with 6 additions and 22 deletions

28
modules/nixos/hydra.nix
View file

@ -1,21 +1,5 @@
{ lib, pkgs, config, ... }: { pkgs, config, ... }:
{ {
options.services.hydra = {
adminPasswordFile = lib.mkOption {
type = lib.types.str;
description = "The initial password for the Hydra admin account";
};
usersFile = lib.mkOption {
type = lib.types.str;
description = ''
declarative user accounts for hydra.
format: user;role;password-hash;email-address;full-name
Password hash is computed by applying sha1 to the password.
'';
};
};
config = { config = {
sops.secrets.hydra-admin-password.owner = "hydra"; sops.secrets.hydra-admin-password.owner = "hydra";
sops.secrets.hydra-users.owner = "hydra"; sops.secrets.hydra-users.owner = "hydra";
@ -58,8 +42,6 @@
notificationSender = "hydra@hydra.nix-community.org"; notificationSender = "hydra@hydra.nix-community.org";
port = 3000; port = 3000;
useSubstitutes = true; useSubstitutes = true;
adminPasswordFile = config.sops.secrets.hydra-admin-password.path;
usersFile = config.sops.secrets.hydra-users.path;
extraConfig = '' extraConfig = ''
max_output_size = ${builtins.toString (8 * 1024 * 1024 * 1024)} max_output_size = ${builtins.toString (8 * 1024 * 1024 * 1024)}
''; '';
@ -73,7 +55,9 @@
}; };
}; };
# Create a admin user and configure a declarative project # Create user accounts
# format: user;role;password-hash;email-address;full-name
# Password hash is computed by applying sha1 to the password.
systemd.services.hydra-post-init = { systemd.services.hydra-post-init = {
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -97,13 +81,13 @@
opts+=("--full-name" "$fullname") opts+=("--full-name" "$fullname")
fi fi
hydra-create-user "''${opts[@]}" hydra-create-user "''${opts[@]}"
done < ${config.services.hydra.usersFile} done < ${config.sops.secrets.hydra-users.path}
while ! nc -z localhost ${toString config.services.hydra.port}; do while ! nc -z localhost ${toString config.services.hydra.port}; do
sleep 1 sleep 1
done done
export HYDRA_ADMIN_PASSWORD=$(cat ${config.services.hydra.adminPasswordFile}) export HYDRA_ADMIN_PASSWORD=$(cat ${config.sops.secrets.hydra-admin-password.path})
export URL=http://localhost:${toString config.services.hydra.port} export URL=http://localhost:${toString config.services.hydra.port}
''; '';
}; };