Compare commits
No commits in common. "0834ce42d0fa66f99f3c763cb149445c058afcb0" and "41de261af01e04fe98151697f96a850c7881b989" have entirely different histories.
0834ce42d0
...
41de261af0
4 changed files with 9 additions and 23 deletions
|
|
@ -2,8 +2,8 @@
|
||||||
let
|
let
|
||||||
cfg = import /etc/nixos/modules/vars.nix;
|
cfg = import /etc/nixos/modules/vars.nix;
|
||||||
crossseed_port = cfg.arrstack.crossseed.port;
|
crossseed_port = cfg.arrstack.crossseed.port;
|
||||||
PUID = toString config.users.users.arr.uid;
|
#outpost_port = cfg.authentik.outpostPort;
|
||||||
PGID = toString config.users.groups.arr.gid;
|
#domain = "mc-fucker.cool";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
@ -12,21 +12,24 @@ in
|
||||||
cmd = [ "daemon" ];
|
cmd = [ "daemon" ];
|
||||||
environment = {
|
environment = {
|
||||||
TZ = "Europe/Berlin";
|
TZ = "Europe/Berlin";
|
||||||
|
PUID = toString config.users.users.arr.uid;
|
||||||
|
PGID = toString config.users.groups.arr.gid;
|
||||||
};
|
};
|
||||||
ports = [
|
ports = [
|
||||||
"${crossseed_port}:${crossseed_port}"
|
"${crossseed_port}:${crossseed_port}"
|
||||||
];
|
];
|
||||||
user = "${PUID}:${PGID}";
|
|
||||||
volumes = [
|
volumes = [
|
||||||
"/var/lib/cross-seed:/config"
|
"/var/lib/cross-seed:/config"
|
||||||
|
#"/mnt/mergerfs/media:/data"
|
||||||
"/var/lib/qbittorrent/qBittorrent/data/BT_backup:/torrents"
|
"/var/lib/qbittorrent/qBittorrent/data/BT_backup:/torrents"
|
||||||
"/var/lib/qbittorrent/qBittorrent/data/cross-seeds:/cross-seeds"
|
|
||||||
"/mnt/mergerfs/media/qbittorrent:/data/qbittorrent"
|
"/mnt/mergerfs/media/qbittorrent:/data/qbittorrent"
|
||||||
"/mnt/cache/qbittorrent:/cache"
|
|
||||||
];
|
];
|
||||||
extraOptions = cfg.podman.extraOptions;
|
extraOptions = cfg.podman.extraOptions;
|
||||||
autoStart = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#services.nginx.virtualHosts = {
|
||||||
|
|
||||||
|
#};
|
||||||
}
|
}
|
||||||
# vim: set et ts=2 sw=2 ai:
|
# vim: set et ts=2 sw=2 ai:
|
||||||
|
|
|
||||||
|
|
@ -29,8 +29,6 @@ in
|
||||||
environment = {
|
environment = {
|
||||||
TZ = "Europe/Berlin";
|
TZ = "Europe/Berlin";
|
||||||
DOCKER_MODS = "linuxserver/mods:universal-calibre";
|
DOCKER_MODS = "linuxserver/mods:universal-calibre";
|
||||||
PUID = "1337";
|
|
||||||
PGID = "1337";
|
|
||||||
};
|
};
|
||||||
#environmentFiles = [ config.sops.secrets."${name}/env".path ];
|
#environmentFiles = [ config.sops.secrets."${name}/env".path ];
|
||||||
ports = [
|
ports = [
|
||||||
|
|
@ -41,7 +39,6 @@ in
|
||||||
"/mnt/mergerfs/media/books:/books"
|
"/mnt/mergerfs/media/books:/books"
|
||||||
];
|
];
|
||||||
extraOptions = cfg.podman.extraOptions;
|
extraOptions = cfg.podman.extraOptions;
|
||||||
autoStart = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#services.nginx.virtualHosts.${domain} = {
|
#services.nginx.virtualHosts.${domain} = {
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ in
|
||||||
environment = {
|
environment = {
|
||||||
TZ = "Europe/Berlin";
|
TZ = "Europe/Berlin";
|
||||||
ND_SESSIONTIMEOUT = "336h";
|
ND_SESSIONTIMEOUT = "336h";
|
||||||
ND_SCANNER_ENABLED = "false";
|
|
||||||
};
|
};
|
||||||
environmentFiles = [ config.sops.secrets.navidrome.path ];
|
environmentFiles = [ config.sops.secrets.navidrome.path ];
|
||||||
ports = [
|
ports = [
|
||||||
|
|
|
||||||
|
|
@ -22,19 +22,6 @@ in
|
||||||
pkgs.smartmontools
|
pkgs.smartmontools
|
||||||
];
|
];
|
||||||
users.users.zabbix-agent.extraGroups = [ "systemd-journal" ];
|
users.users.zabbix-agent.extraGroups = [ "systemd-journal" ];
|
||||||
|
|
||||||
#allow zabbix-agent to run smartctl
|
|
||||||
security.sudo.extraRules = [
|
|
||||||
{
|
|
||||||
users = [ "zabbix-agent" ];
|
|
||||||
commands = [
|
|
||||||
{
|
|
||||||
command = "${pkgs.smartmontools}/bin/smartctl";
|
|
||||||
options = [ "NOPASSWD" ];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# vim: set et ts=2 sw=2 ai:
|
# vim: set et ts=2 sw=2 ai:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue