Update nixpkgs and home-manager
All checks were successful
CI / Check, build and cache Nix flake (push) Successful in 1h21m12s
All checks were successful
CI / Check, build and cache Nix flake (push) Successful in 1h21m12s
This commit is contained in:
@@ -226,10 +226,10 @@ in
|
||||
wastebin = {
|
||||
enable = true;
|
||||
settings = {
|
||||
WASTEBIN_MAX_BODY_SIZE = "67108864"; # 16 MiB
|
||||
WASTEBIN_MAX_BODY_SIZE = 67108864; # 16 MiB
|
||||
WASTEBIN_PASSWORD_SALT = "TeGhaemeer0Siez3";
|
||||
};
|
||||
extraSettingsFile = config.age.secrets."object/wastebin.env".path;
|
||||
secretFile = config.age.secrets."object/wastebin.env".path;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@@ -20,6 +20,5 @@
|
||||
nvme = ./nvme;
|
||||
spdk = ./spdk.nix;
|
||||
librespeed = ./librespeed;
|
||||
wastebin = ./wastebin.nix;
|
||||
};
|
||||
}
|
||||
|
@@ -492,7 +492,8 @@ in
|
||||
}
|
||||
];
|
||||
})
|
||||
(mkIf config.services.wastebin.enable {
|
||||
# TODO: Wastebin is not in 23.11, remove check when 24.04 is released
|
||||
(mkIf (config.services ? "wastebin" && config.services.wastebin.enable) {
|
||||
my.tmproot.persistence.config.directories = [ "/var/lib/private/wastebin" ];
|
||||
})
|
||||
]))
|
||||
|
@@ -1,35 +0,0 @@
|
||||
{ lib, pkgs, config, ... }:
|
||||
let
|
||||
inherit (lib) mkIf mkDefault;
|
||||
inherit (lib.my) mkOpt' mkBoolOpt';
|
||||
|
||||
cfg = config.services.wastebin;
|
||||
in
|
||||
{
|
||||
options.services.wastebin = with lib.types; {
|
||||
enable = mkBoolOpt' false "Whether to enable wastebin.";
|
||||
package = mkOpt' package pkgs.wastebin "Package to use.";
|
||||
settings = mkOpt' (attrsOf str) { } "Environment variable settings.";
|
||||
extraSettingsFile = mkOpt' (nullOr str) null "Extra environment file (e.g. for signing key).";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.wastebin.settings = {
|
||||
WASTEBIN_ADDRESS_PORT = mkDefault "[::]:8088";
|
||||
WASTEBIN_DATABASE_PATH = mkDefault "/var/lib/wastebin/db.sqlite3";
|
||||
};
|
||||
|
||||
systemd.services.wastebin = {
|
||||
description = "wastebin minimal pastebin";
|
||||
after = [ "network.target" ];
|
||||
environment = cfg.settings;
|
||||
serviceConfig = {
|
||||
EnvironmentFile = mkIf (cfg.extraSettingsFile != null) cfg.extraSettingsFile;
|
||||
DynamicUser = true;
|
||||
StateDirectory = "wastebin";
|
||||
ExecStart = "${cfg.package}/bin/wastebin";
|
||||
};
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user