ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Moved media and torrenting to zfs dir

Browse Source
This commit is contained in:
Richie Cahill 2024-06-20 21:53:44 -04:00
parent 0598004dc1
commit 87dd18a894
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systems/jeeves/configuration.nix
View File

@ -51,7 +51,7 @@
plex = { plex = {
enable = true; enable = true;
dataDir = "/ZFS/media/Plex/"; dataDir = "/zfs/media/Plex/";
}; };
smartd.enable = true; smartd.enable = true;
@ -62,7 +62,7 @@
syncthing.settings.folders = { syncthing.settings.folders = {
"notes" = { "notes" = {
id = "l62ul-lpweo"; # cspell:disable-line id = "l62ul-lpweo"; # cspell:disable-line
path = "/ZFS/media/Notes"; path = "/zfs/media/Notes";
devices = [ devices = [
"bob" "bob"
"phone" "phone"
@ -131,7 +131,7 @@
serviceConfig = { serviceConfig = {
Environment = "ZFS_BIN=${pkgs.zfs}/bin/zfs"; Environment = "ZFS_BIN=${pkgs.zfs}/bin/zfs";
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.python3}/bin/python3 /ZFS/media/Scripts/new/ZFS/snapshot_manager.py --config-file='/root/nix-dotfiles/systems/jeeves/snapshot_config.toml'"; ExecStart = "${pkgs.python3}/bin/python3 /zfs/media/Scripts/new/zfs/snapshot_manager.py --config-file='/root/nix-dotfiles/systems/jeeves/snapshot_config.toml'";
}; };
}; };
timers."snapshot_manager" = { timers."snapshot_manager" = {

2
systems/jeeves/docker/filebrowser.nix
View File

@ -4,7 +4,7 @@
ports = [ "8080:8080" ]; ports = [ "8080:8080" ];
volumes = [ volumes = [
"/ZFS:/data" "/ZFS:/data"
"/ZFS/media/Docker/filebrowser:/config" "/zfs/media/Docker/filebrowser:/config"
]; ];
autoStart = true; autoStart = true;
user = "nobody:users"; user = "nobody:users";

20
systems/jeeves/docker/internal.nix
View File

@ -9,8 +9,8 @@
"29432:29432" "29432:29432"
]; ];
volumes = [ volumes = [
"/ZFS/media/Docker/Docker/Storage/qbit:/config" "/zfs/media/Docker/Docker/Storage/qbit:/config"
"/ZFS/torrenting/qbit/:/data" "/zfs/torrenting/qbit/:/data"
]; ];
environment = { environment = {
PUID = "998"; PUID = "998";
@ -29,8 +29,8 @@
"8118:8118" "8118:8118"
]; ];
volumes = [ volumes = [
"/ZFS/media/Docker/Docker/Storage/qbitvpn:/config" "/zfs/media/Docker/Docker/Storage/qbitvpn:/config"
"/ZFS/torrenting/qbitvpn/:/data" "/zfs/torrenting/qbitvpn/:/data"
"/etc/localtime:/etc/localtime:ro" "/etc/localtime:/etc/localtime:ro"
]; ];
environment = { environment = {
@ -48,7 +48,7 @@
DELUGE_DAEMON_LOG_LEVEL = "debug"; DELUGE_DAEMON_LOG_LEVEL = "debug";
DELUGE_WEB_LOG_LEVEL = "debug"; DELUGE_WEB_LOG_LEVEL = "debug";
}; };
environmentFiles = [ "/ZFS/media/Docker/Docker/jeeves/internal/qbitvpn.env" ]; environmentFiles = [ "/zfs/media/Docker/Docker/jeeves/internal/qbitvpn.env" ];
autoStart = true; autoStart = true;
}; };
prowlarr = { prowlarr = {
@ -58,7 +58,7 @@
PGID = "100"; PGID = "100";
TZ = "America/New_York"; TZ = "America/New_York";
}; };
volumes = [ "/ZFS/media/Docker/Docker/Storage/prowlarr:/config" ]; volumes = [ "/zfs/media/Docker/Docker/Storage/prowlarr:/config" ];
autoStart = true; autoStart = true;
}; };
radarr = { radarr = {
@ -69,9 +69,9 @@
TZ = "America/New_York"; TZ = "America/New_York";
}; };
volumes = [ volumes = [
"/ZFS/media/Docker/Docker/Storage/radarr:/config" "/zfs/media/Docker/Docker/Storage/radarr:/config"
"/ZFS/storage/Plex/Movies:/movies" "/ZFS/storage/Plex/Movies:/movies"
"/ZFS/torrenting/qbitvpn:/data" "/zfs/torrenting/qbitvpn:/data"
]; ];
autoStart = true; autoStart = true;
}; };
@ -83,9 +83,9 @@
TZ = "America/New_York"; TZ = "America/New_York";
}; };
volumes = [ volumes = [
"/ZFS/media/Docker/Docker/Storage/sonarr:/config" "/zfs/media/Docker/Docker/Storage/sonarr:/config"
"/ZFS/storage/Plex/TV:/tv" "/ZFS/storage/Plex/TV:/tv"
"/ZFS/torrenting/qbitvpn:/data" "/zfs/torrenting/qbitvpn:/data"
]; ];
autoStart = true; autoStart = true;
}; };

2
systems/jeeves/docker/postgresql.nix
View File

@ -15,7 +15,7 @@
postgres = { postgres = {
image = "postgres:16"; image = "postgres:16";
ports = [ "5432:5432" ]; ports = [ "5432:5432" ];
volumes = [ "/ZFS/media/databases/postgres:/var/lib/postgresql/data" ]; volumes = [ "/zfs/media/databases/postgres:/var/lib/postgresql/data" ];
environment = { environment = {
POSTGRES_USER = "admin"; POSTGRES_USER = "admin";
POSTGRES_DB = "archive"; POSTGRES_DB = "archive";

16
systems/jeeves/docker/web.nix
View File

@ -2,7 +2,7 @@
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
grafana = { grafana = {
image = "grafana/grafana-enterprise"; image = "grafana/grafana-enterprise";
volumes = [ "/ZFS/media/Docker/Docker/Storage/grafana:/var/lib/grafana" ]; volumes = [ "/zfs/media/Docker/Docker/Storage/grafana:/var/lib/grafana" ];
user = "998:998"; user = "998:998";
extraOptions = [ "--network=web" ]; extraOptions = [ "--network=web" ];
autoStart = true; autoStart = true;
@ -10,7 +10,7 @@
dnd_file_server = { dnd_file_server = {
image = "ubuntu/apache2:latest"; image = "ubuntu/apache2:latest";
volumes = [ volumes = [
"/ZFS/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/" "/zfs/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
"/ZFS/storage/Main/Table_Top/:/data" "/ZFS/storage/Main/Table_Top/:/data"
]; ];
extraOptions = [ "--network=web" ]; extraOptions = [ "--network=web" ];
@ -19,8 +19,8 @@
arch_mirror = { arch_mirror = {
image = "ubuntu/apache2:latest"; image = "ubuntu/apache2:latest";
volumes = [ volumes = [
"/ZFS/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/" "/zfs/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/"
"/ZFS/media/Mirror/:/data" "/zfs/media/Mirror/:/data"
]; ];
ports = [ "800:80" ]; ports = [ "800:80" ];
extraOptions = [ "--network=web" ]; extraOptions = [ "--network=web" ];
@ -33,9 +33,9 @@
TZ = "Etc/EST"; TZ = "Etc/EST";
}; };
volumes = [ volumes = [
"/ZFS/media/Docker/Docker/jeeves/web/haproxy/cloudflare.pem:/etc/ssl/certs/cloudflare.pem" "/zfs/media/Docker/Docker/jeeves/web/haproxy/cloudflare.pem:/etc/ssl/certs/cloudflare.pem"
"/ZFS/media/Docker/Docker/jeeves/web/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg" "/zfs/media/Docker/Docker/jeeves/web/haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg"
"/ZFS/media/Docker/Docker/jeeves/web/haproxy/API:/run/haproxy/" "/zfs/media/Docker/Docker/jeeves/web/haproxy/API:/run/haproxy/"
]; ];
dependsOn = [ dependsOn = [
"grafana" "grafana"
@ -51,7 +51,7 @@
"tunnel" "tunnel"
"run" "run"
]; ];
environmentFiles = [ "/ZFS/media/Docker/Docker/jeeves/web/cloudflare_tunnel.env" ]; environmentFiles = [ "/zfs/media/Docker/Docker/jeeves/web/cloudflare_tunnel.env" ];
dependsOn = [ "haproxy" ]; dependsOn = [ "haproxy" ];
extraOptions = [ "--network=web" ]; extraOptions = [ "--network=web" ];
autoStart = true; autoStart = true;