cleanup
This commit is contained in:
@@ -239,6 +239,10 @@
|
||||
"wheel"
|
||||
"video"
|
||||
"render"
|
||||
|
||||
"minecraft"
|
||||
"gitea"
|
||||
"jellyfin"
|
||||
];
|
||||
hashedPasswordFile = "/etc/nixos/secrets/hashedPass";
|
||||
|
||||
|
||||
Binary file not shown.
@@ -11,7 +11,7 @@
|
||||
port = service_configs.ports.immich;
|
||||
host = "0.0.0.0";
|
||||
database = {
|
||||
createDB = true;
|
||||
createDB = false;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@
|
||||
# used for local streaming
|
||||
openFirewall = true;
|
||||
|
||||
user = "primary";
|
||||
group = "users";
|
||||
dataDir = service_configs.jellyfin.data_dir;
|
||||
cacheDir = service_configs.jellyfin.cache_dir;
|
||||
};
|
||||
|
||||
@@ -14,14 +14,11 @@ in
|
||||
"minecraft-server"
|
||||
];
|
||||
|
||||
users.groups.minecraft = { };
|
||||
|
||||
services.minecraft-servers = {
|
||||
enable = true;
|
||||
eula = true;
|
||||
dataDir = service_configs.minecraft.parent_dir;
|
||||
openFirewall = true;
|
||||
group = "users";
|
||||
|
||||
servers.${service_configs.minecraft.server_name} = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,66 +1,57 @@
|
||||
{ service_configs, ... }:
|
||||
{
|
||||
virtualisation.quadlet = {
|
||||
containers =
|
||||
let
|
||||
baseContainerConfig = {
|
||||
autoUpdate = "registry";
|
||||
containers = {
|
||||
gluetun.containerConfig = {
|
||||
image = "docker.io/qmcgaw/gluetun";
|
||||
name = "gluetun";
|
||||
autoUpdate = "registry";
|
||||
|
||||
addCapabilities = [
|
||||
"NET_ADMIN"
|
||||
"MKNOD"
|
||||
];
|
||||
|
||||
environments = import ../secrets/mullvad.nix;
|
||||
|
||||
publishPorts = [
|
||||
"6081:6081"
|
||||
"6081:6081/udp"
|
||||
"${builtins.toString service_configs.ports.torrent}:6011"
|
||||
];
|
||||
|
||||
volumes = [ "${service_configs.gluetun.dir}:/gluetun:z" ];
|
||||
podmanArgs = [
|
||||
"--device=/dev/net/tun"
|
||||
"--security-opt label=disable"
|
||||
];
|
||||
};
|
||||
|
||||
qbittorrent = {
|
||||
containerConfig = {
|
||||
image = "lscr.io/linuxserver/qbittorrent:latest";
|
||||
name = "qbittorrent";
|
||||
environments = {
|
||||
WEBUI_PORT = service_configs.ports.torrent;
|
||||
DOCKER_MODS = "ghcr.io/gabe565/linuxserver-mod-vuetorrent";
|
||||
PUID = 1000;
|
||||
PGID = 1000;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
gluetun.containerConfig = baseContainerConfig // {
|
||||
image = "docker.io/qmcgaw/gluetun";
|
||||
name = "gluetun";
|
||||
|
||||
addCapabilities = [
|
||||
"NET_ADMIN"
|
||||
"MKNOD"
|
||||
volumes = [
|
||||
"${service_configs.torrent.config_dir}:/config:z"
|
||||
"${service_configs.torrent.download_dir}:/downloads:z"
|
||||
];
|
||||
|
||||
environments = import ../secrets/mullvad.nix;
|
||||
|
||||
publishPorts = [
|
||||
"6081:6081"
|
||||
"6081:6081/udp"
|
||||
"${builtins.toString service_configs.ports.torrent}:6011"
|
||||
];
|
||||
|
||||
volumes = [ "${service_configs.gluetun.dir}:/gluetun:z" ];
|
||||
podmanArgs = [
|
||||
"--device=/dev/net/tun"
|
||||
"--security-opt label=disable"
|
||||
];
|
||||
networks = [ "container:gluetun" ];
|
||||
};
|
||||
|
||||
qbittorrent = {
|
||||
containerConfig = baseContainerConfig // {
|
||||
image = "lscr.io/linuxserver/qbittorrent:latest";
|
||||
name = "qbittorrent";
|
||||
environments = {
|
||||
WEBUI_PORT = service_configs.ports.torrent;
|
||||
DOCKER_MODS = "ghcr.io/gabe565/linuxserver-mod-vuetorrent";
|
||||
PUID = 1000;
|
||||
PGID = 1000;
|
||||
};
|
||||
|
||||
volumes = [
|
||||
"${service_configs.torrent.config_dir}:/config:z"
|
||||
"${service_configs.torrent.download_dir}:/downloads:z"
|
||||
];
|
||||
|
||||
networks = [ "container:gluetun" ];
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
requires = [ "gluetun.service" ];
|
||||
after = [ "gluetun.service" ];
|
||||
};
|
||||
serviceConfig = {
|
||||
requires = [ "gluetun.service" ];
|
||||
after = [ "gluetun.service" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
networks = {
|
||||
internal.networkConfig.subnets = [ "10.0.123.1/24" ];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user