SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-09-28 19:17:51 +00:00
Code Issues Projects Releases Wiki Activity

sp-nixos-rebuild: relock sp-modules each time

Browse source
This commit is contained in:
Alexander Tomokhov 2023-12-12 14:13:32 +04:00
parent 0701984053
commit 2bdb73d348
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
nixos/module.nix
View file

@ -1,32 +1,26 @@
selfprivacy-graphql-api: { config, lib, pkgs, ... }: selfprivacy-graphql-api: { config, lib, pkgs, ... }:
with lib;
let let
cfg = config.services.selfprivacy-api; cfg = config.services.selfprivacy-api;
directionArg =
if cfg.direction == ""
then ""
else "--direction=${cfg.direction}";
in in
{ {
options.services.selfprivacy-api = { options.services.selfprivacy-api = {
enable = mkOption { enable = lib.mkOption {
default = true; default = true;
type = types.bool; type = lib.types.bool;
description = '' description = ''
Enable SelfPrivacy API service Enable SelfPrivacy API service
''; '';
}; };
enableSwagger = mkOption { enableSwagger = lib.mkOption {
default = false; default = false;
type = types.bool; type = lib.types.bool;
description = '' description = ''
Enable Swagger UI Enable Swagger UI
''; '';
}; };
b2Bucket = mkOption { b2Bucket = lib.mkOption {
type = types.str; type = lib.types.str;
description = '' description = ''
B2 bucket B2 bucket
''; '';
@ -109,19 +103,23 @@ in
HOME = "/root"; HOME = "/root";
} // config.networking.proxy.envVars; } // config.networking.proxy.envVars;
path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild ]; path = [ pkgs.coreutils pkgs.gnutar pkgs.xz.bin pkgs.gzip pkgs.gitMinimal config.nix.package.out pkgs.nixos-rebuild ];
# TODO set proper timeout for reboot instead of service restart
serviceConfig = { serviceConfig = {
User = "root"; User = "root";
KillMode = "none"; KillMode = "none";
SendSIGKILL = "no"; SendSIGKILL = "no";
}; };
script = '' script = ''
${config.nix.package}/bin/nix flake lock --update-input sp-modules # relock sp-modules to absolute path (in terms of Nix) due to Nix bugs:
# https://github.com/NixOS/nix/issues/9339
${config.nix.package}/bin/nix flake lock /etc/nixos --override-input sp-modules /etc/nixos/sp-modules
${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos
''; '';
}; };
# One shot systemd service to upgrade NixOS using nixos-rebuild # One shot systemd service to upgrade NixOS using nixos-rebuild
systemd.services.sp-nixos-upgrade = { systemd.services.sp-nixos-upgrade = {
description = "Upgrade NixOS to the latest base configuration"; description = "Upgrade NixOS and SP modules to latest versions";
environment = config.nix.envVars // { environment = config.nix.envVars // {
HOME = "/root"; HOME = "/root";
} // config.networking.proxy.envVars; } // config.networking.proxy.envVars;
@ -132,7 +130,10 @@ in
SendSIGKILL = "no"; SendSIGKILL = "no";
}; };
script = '' script = ''
${config.nix.package}/bin/nix flake update --override-input selfprivacy-nixos-config "git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes" # FIXME get URL from systemd parameter
# relock sp-modules to absolute path (in terms of Nix)
${config.nix.package}/bin/nix flake update /etc/nixos --override-input selfprivacy-nixos-config git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nixos-config.git?ref=flakes
${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos ${pkgs.nixos-rebuild}/bin/nixos-rebuild switch --flake /etc/nixos#sp-nixos
''; '';
}; };