From 0f788a1901749d559566d4141ae4beb3e183d5b8 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sun, 5 Jan 2025 20:29:37 -0500 Subject: [PATCH] added share container --- systems/jeeves/docker/haproxy.cfg | 6 ++++++ systems/jeeves/docker/share.nix | 14 ++++++++++++++ systems/jeeves/scripts/zfs.sh | 2 +- systems/jeeves/vars.nix | 1 + 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 systems/jeeves/docker/share.nix diff --git a/systems/jeeves/docker/haproxy.cfg b/systems/jeeves/docker/haproxy.cfg index 7abe393..8e44f8e 100644 --- a/systems/jeeves/docker/haproxy.cfg +++ b/systems/jeeves/docker/haproxy.cfg @@ -31,6 +31,7 @@ frontend ContentSwitching acl host_grafana hdr(host) -i grafana.tmmworkshop.com acl host_homeassistant hdr(host) -i homeassistant.tmmworkshop.com acl host_photoprism hdr(host) -i photoprism.tmmworkshop.com + acl host_share hdr(host) -i share.tmmworkshop.com acl host_uptime_kuma hdr(host) -i uptimekuma-jeeves.tmmworkshop.com use_backend audiobookshelf_nodes if host_audiobookshelf @@ -39,6 +40,7 @@ frontend ContentSwitching use_backend grafana_nodes if host_grafana use_backend homeassistant_nodes if host_homeassistant use_backend photoprism_nodes if host_photoprism + use_backend share_nodes if host_share use_backend uptime_kuma_nodes if host_uptime_kuma backend audiobookshelf_nodes @@ -65,6 +67,10 @@ backend photoprism_nodes mode http server server photoprism:2342 +backend share_nodes + mode http + server server share:80 + backend uptime_kuma_nodes mode http server server uptime_kuma:3001 diff --git a/systems/jeeves/docker/share.nix b/systems/jeeves/docker/share.nix new file mode 100644 index 0000000..b66532d --- /dev/null +++ b/systems/jeeves/docker/share.nix @@ -0,0 +1,14 @@ +let + vars = import ../vars.nix; +in +{ + virtualisation.oci-containers.containers.share = { + image = "ubuntu/apache2:latest"; + volumes = [ + "${../../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/" + "${vars.media_share}:/data" + ]; + extraOptions = [ "--network=web" ]; + autoStart = true; + }; +} diff --git a/systems/jeeves/scripts/zfs.sh b/systems/jeeves/scripts/zfs.sh index e19feaf..0ef9732 100644 --- a/systems/jeeves/scripts/zfs.sh +++ b/systems/jeeves/scripts/zfs.sh @@ -19,11 +19,11 @@ sudo zpool add torrenting -o ashift=12 special sudo zfs create -o compression=zstd-9 media/docker sudo zfs create -o recordsize=1M -o compression=zstd-19 media/library sudo zfs create -o compression=zstd-9 -o sync=disabled media/github-runners -sudo zfs create -o exec=off media/minio sudo zfs create -o copies=3 media/notes sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/media/database/photoprism_mariadb media/photoprism_mariadb sudo zfs create -o compression=zstd-9 media/plex sudo zfs create -o compression=zstd-19 media/home_assistant +sudo zfs create -o exec=off media/share sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/media/database/postgres media/postgres # storage datasets diff --git a/systems/jeeves/vars.nix b/systems/jeeves/vars.nix index 5db64a4..0f30bd0 100644 --- a/systems/jeeves/vars.nix +++ b/systems/jeeves/vars.nix @@ -10,6 +10,7 @@ in media_docker = "${zfs_media}/docker"; media_docker_configs = "${zfs_media}/docker/configs"; media_mirror = "${zfs_media}/mirror"; + media_share = "${zfs_media}/share"; media_notes = "${zfs_media}/notes"; media_plex = "${zfs_media}/plex"; media_home_assistant = "${zfs_media}/home_assistant";