diff --git a/.vscode/settings.json b/.vscode/settings.json index 3eb7a5a..3b07fe7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -170,7 +170,7 @@ "topsites", "topstories", "Toqozz", - "Torenting", + "torrenting", "twimg", "uaccess", "ublock", diff --git a/systems/jeeves/configuration.nix b/systems/jeeves/configuration.nix index 187987e..526e04b 100644 --- a/systems/jeeves/configuration.nix +++ b/systems/jeeves/configuration.nix @@ -13,9 +13,9 @@ boot = { zfs.extraPools = [ - "Media" - "Storage" - "Torenting" + "media" + "storage" + "torrenting" ]; filesystem = "zfs"; useSystemdBoot = true; @@ -50,7 +50,7 @@ plex = { enable = true; - dataDir = "/ZFS/Media/Plex/"; + dataDir = "/ZFS/media/Plex/"; }; smartd.enable = true; @@ -61,7 +61,7 @@ syncthing.settings.folders = { "notes" = { id = "l62ul-lpweo"; # cspell:disable-line - path = "/ZFS/Media/Notes"; + path = "/ZFS/media/Notes"; devices = [ "bob" "phone" @@ -71,7 +71,7 @@ }; "books" = { id = "6uppx-vadmy"; # cspell:disable-line - path = "/ZFS/Storage/Syncthing/books"; + path = "/ZFS/storage/Syncthing/books"; devices = [ "bob" "phone" @@ -81,7 +81,7 @@ }; "important" = { id = "4ckma-gtshs"; # cspell:disable-line - path = "/ZFS/Storage/Syncthing/important"; + path = "/ZFS/storage/Syncthing/important"; devices = [ "bob" "phone" @@ -91,7 +91,7 @@ }; "music" = { id = "vprc5-3azqc"; # cspell:disable-line - path = "/ZFS/Storage/Syncthing/music"; + path = "/ZFS/storage/Syncthing/music"; devices = [ "bob" "phone" @@ -101,7 +101,7 @@ }; "projects" = { id = "vyma6-lqqrz"; # cspell:disable-line - path = "/ZFS/Storage/Syncthing/projects"; + path = "/ZFS/storage/Syncthing/projects"; devices = [ "bob" "rhapsody-in-green" @@ -130,7 +130,7 @@ serviceConfig = { Environment = "ZFS_BIN=${pkgs.zfs}/bin/zfs"; Type = "oneshot"; - ExecStart = "${pkgs.python3}/bin/python3 /ZFS/Media/Scripts/new/ZFS/snapshot_manager.py --config-file='/ZFS/Media/Scripts/new/config.toml'"; + ExecStart = "${pkgs.python3}/bin/python3 /ZFS/media/Scripts/new/ZFS/snapshot_manager.py --config-file='/ZFS/media/Scripts/new/config.toml'"; }; }; timers."snapshot_manager" = { diff --git a/systems/jeeves/docker/filebrowser.nix b/systems/jeeves/docker/filebrowser.nix index a092204..9db2bfc 100644 --- a/systems/jeeves/docker/filebrowser.nix +++ b/systems/jeeves/docker/filebrowser.nix @@ -4,7 +4,7 @@ ports = [ "8080:8080" ]; volumes = [ "/ZFS:/data" - "/ZFS/Media/Docker/filebrowser:/config" + "/ZFS/media/Docker/filebrowser:/config" ]; autoStart = true; user = "nobody:users"; diff --git a/systems/jeeves/docker/internal.nix b/systems/jeeves/docker/internal.nix index bd319d8..e369cce 100644 --- a/systems/jeeves/docker/internal.nix +++ b/systems/jeeves/docker/internal.nix @@ -9,8 +9,8 @@ "29432:29432" ]; volumes = [ - "/ZFS/Media/Docker/Docker/Storage/qbit:/config" - "/ZFS/Torenting/Qbit/:/data" + "/ZFS/media/Docker/Docker/Storage/qbit:/config" + "/ZFS/torrenting/Qbit/:/data" ]; environment = { PUID = "998"; @@ -29,8 +29,8 @@ "8118:8118" ]; volumes = [ - "/ZFS/Media/Docker/Docker/Storage/qbitvpn:/config" - "/ZFS/Torenting/QbitVPN/:/data" + "/ZFS/media/Docker/Docker/Storage/qbitvpn:/config" + "/ZFS/torrenting/QbitVPN/:/data" "/etc/localtime:/etc/localtime:ro" ]; environment = { @@ -48,7 +48,7 @@ DELUGE_DAEMON_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; }; prowlarr = { @@ -58,7 +58,7 @@ PGID = "100"; TZ = "America/New_York"; }; - volumes = [ "/ZFS/Media/Docker/Docker/Storage/prowlarr:/config" ]; + volumes = [ "/ZFS/media/Docker/Docker/Storage/prowlarr:/config" ]; autoStart = true; }; radarr = { @@ -69,9 +69,9 @@ TZ = "America/New_York"; }; volumes = [ - "/ZFS/Media/Docker/Docker/Storage/radarr:/config" - "/ZFS/Storage/Plex/Movies:/movies" - "/ZFS/Torenting/QbitVPN:/data" + "/ZFS/media/Docker/Docker/Storage/radarr:/config" + "/ZFS/storage/Plex/Movies:/movies" + "/ZFS/torrenting/QbitVPN:/data" ]; autoStart = true; }; @@ -83,9 +83,9 @@ TZ = "America/New_York"; }; volumes = [ - "/ZFS/Media/Docker/Docker/Storage/sonarr:/config" - "/ZFS/Storage/Plex/TV:/tv" - "/ZFS/Torenting/QbitVPN:/data" + "/ZFS/media/Docker/Docker/Storage/sonarr:/config" + "/ZFS/storage/Plex/TV:/tv" + "/ZFS/torrenting/QbitVPN:/data" ]; autoStart = true; }; diff --git a/systems/jeeves/docker/postgresql.nix b/systems/jeeves/docker/postgresql.nix index 0304323..05a631f 100644 --- a/systems/jeeves/docker/postgresql.nix +++ b/systems/jeeves/docker/postgresql.nix @@ -15,7 +15,7 @@ postgres = { image = "postgres:16"; ports = [ "5432:5432" ]; - volumes = [ "/ZFS/Media/databases/postgres:/var/lib/postgresql/data" ]; + volumes = [ "/ZFS/media/databases/postgres:/var/lib/postgresql/data" ]; environment = { POSTGRES_USER = "admin"; POSTGRES_DB = "archive"; diff --git a/systems/jeeves/docker/web.nix b/systems/jeeves/docker/web.nix index bee1b8d..b2926b1 100644 --- a/systems/jeeves/docker/web.nix +++ b/systems/jeeves/docker/web.nix @@ -2,7 +2,7 @@ virtualisation.oci-containers.containers = { grafana = { 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"; extraOptions = [ "--network=web" ]; autoStart = true; @@ -10,8 +10,8 @@ dnd_file_server = { image = "ubuntu/apache2:latest"; volumes = [ - "/ZFS/Media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/" - "/ZFS/Storage/Main/Table_Top/:/data" + "/ZFS/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/" + "/ZFS/storage/Main/Table_Top/:/data" ]; extraOptions = [ "--network=web" ]; autoStart = true; @@ -19,8 +19,8 @@ arch_mirror = { image = "ubuntu/apache2:latest"; volumes = [ - "/ZFS/Media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/" - "/ZFS/Media/Mirror/:/data" + "/ZFS/media/Docker/Docker/templates/file_server/sites/:/etc/apache2/sites-enabled/" + "/ZFS/media/Mirror/:/data" ]; ports = [ "800:80" ]; extraOptions = [ "--network=web" ]; @@ -33,9 +33,9 @@ TZ = "Etc/EST"; }; volumes = [ - "/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/API:/run/haproxy/" + "/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/API:/run/haproxy/" ]; dependsOn = [ "grafana" @@ -51,7 +51,7 @@ "tunnel" "run" ]; - environmentFiles = [ "/ZFS/Media/Docker/Docker/jeeves/web/cloudflare_tunnel.env" ]; + environmentFiles = [ "/ZFS/media/Docker/Docker/jeeves/web/cloudflare_tunnel.env" ]; dependsOn = [ "haproxy" ]; extraOptions = [ "--network=web" ]; autoStart = true;