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

removed Docker/Docker/Storage and Docker/Docker

Browse Source
This commit is contained in:
Richie Cahill 2024-06-20 22:20:08 -04:00
parent d83b4661ee
commit de4bf3da89
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
"29432:29432" "29432:29432"
]; ];
volumes = [ volumes = [
"/zfs/media/Docker/Docker/Storage/qbit:/config" "/zfs/media/docker/configs/qbit:/config"
"/zfs/torrenting/qbit/:/data" "/zfs/torrenting/qbit/:/data"
]; ];
environment = { environment = {
@ -29,7 +29,7 @@
"8118:8118" "8118:8118"
]; ];
volumes = [ volumes = [
"/zfs/media/Docker/Docker/Storage/qbitvpn:/config" "/zfs/media/docker/configs/qbitvpn:/config"
"/zfs/torrenting/qbitvpn/:/data" "/zfs/torrenting/qbitvpn/:/data"
"/etc/localtime:/etc/localtime:ro" "/etc/localtime:/etc/localtime:ro"
]; ];
@ -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/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/configs/prowlarr:/config" ];
autoStart = true; autoStart = true;
}; };
radarr = { radarr = {
@ -69,7 +69,7 @@
TZ = "America/New_York"; TZ = "America/New_York";
}; };
volumes = [ volumes = [
"/zfs/media/Docker/Docker/Storage/radarr:/config" "/zfs/media/docker/configs/radarr:/config"
"/ZFS/storage/Plex/Movies:/movies" "/ZFS/storage/Plex/Movies:/movies"
"/zfs/torrenting/qbitvpn:/data" "/zfs/torrenting/qbitvpn:/data"
]; ];
@ -83,7 +83,7 @@
TZ = "America/New_York"; TZ = "America/New_York";
}; };
volumes = [ volumes = [
"/zfs/media/Docker/Docker/Storage/sonarr:/config" "/zfs/media/docker/configs/sonarr:/config"
"/ZFS/storage/Plex/TV:/tv" "/ZFS/storage/Plex/TV:/tv"
"/zfs/torrenting/qbitvpn:/data" "/zfs/torrenting/qbitvpn:/data"
]; ];

13
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/configs/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/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,7 +19,7 @@
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/templates/file_server/sites/:/etc/apache2/sites-enabled/"
"/zfs/media/Mirror/:/data" "/zfs/media/Mirror/:/data"
]; ];
ports = [ "800:80" ]; ports = [ "800:80" ];
@ -33,9 +33,8 @@
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/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/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg"
"/zfs/media/Docker/Docker/jeeves/web/haproxy/API:/run/haproxy/"
]; ];
dependsOn = [ dependsOn = [
"grafana" "grafana"
@ -51,7 +50,7 @@
"tunnel" "tunnel"
"run" "run"
]; ];
environmentFiles = [ "/zfs/media/Docker/Docker/jeeves/web/cloudflare_tunnel.env" ]; environmentFiles = [ "/zfs/media/docker/cloudflare_tunnel.env" ];
dependsOn = [ "haproxy" ]; dependsOn = [ "haproxy" ];
extraOptions = [ "--network=web" ]; extraOptions = [ "--network=web" ];
autoStart = true; autoStart = true;