From 81ab03f3f1a7198d896e9d69780d7b6a55cfe6a1 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sat, 1 Feb 2025 22:53:22 -0500 Subject: [PATCH] moved audiobookshelf to a service --- systems/jeeves/docker/audiobookshelf.nix | 19 ------------------- systems/jeeves/docker/haproxy.cfg | 2 +- systems/jeeves/docker/reverse_proxy.nix | 1 - systems/jeeves/services/audiobookshelf.nix | 13 +++++++++++++ systems/jeeves/services/validate_system.toml | 4 ++-- 5 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 systems/jeeves/docker/audiobookshelf.nix create mode 100644 systems/jeeves/services/audiobookshelf.nix diff --git a/systems/jeeves/docker/audiobookshelf.nix b/systems/jeeves/docker/audiobookshelf.nix deleted file mode 100644 index 76c2c00..0000000 --- a/systems/jeeves/docker/audiobookshelf.nix +++ /dev/null @@ -1,19 +0,0 @@ -let - vars = import ../vars.nix; -in -{ - virtualisation.oci-containers.containers.audiobookshelf = { - image = "ghcr.io/advplyr/audiobookshelf:2.18.1"; - volumes = [ - "${vars.media_docker_configs}/audiobookshelf/config:/config" - "${vars.media_docker_configs}/audiobookshelf/metadata:/metadata" - "${vars.storage_library}/audiobooks:/${vars.storage_library}/audiobooks" - "${vars.storage_library}/books:/${vars.storage_library}/books" - ]; - environment = { - TZ = "America/New_York"; - }; - extraOptions = [ "--network=web" ]; - autoStart = true; - }; -} diff --git a/systems/jeeves/docker/haproxy.cfg b/systems/jeeves/docker/haproxy.cfg index 2438f1e..d64eb67 100644 --- a/systems/jeeves/docker/haproxy.cfg +++ b/systems/jeeves/docker/haproxy.cfg @@ -45,7 +45,7 @@ frontend ContentSwitching backend audiobookshelf_nodes mode http - server server audiobookshelf:80 + server server 192.168.90.40:8000 backend cache_nodes mode http diff --git a/systems/jeeves/docker/reverse_proxy.nix b/systems/jeeves/docker/reverse_proxy.nix index 6ca3cd7..8ef5168 100644 --- a/systems/jeeves/docker/reverse_proxy.nix +++ b/systems/jeeves/docker/reverse_proxy.nix @@ -14,7 +14,6 @@ in "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg" ]; dependsOn = [ - "audiobookshelf" "photoprism" "uptime_kuma" ]; diff --git a/systems/jeeves/services/audiobookshelf.nix b/systems/jeeves/services/audiobookshelf.nix new file mode 100644 index 0000000..29a2737 --- /dev/null +++ b/systems/jeeves/services/audiobookshelf.nix @@ -0,0 +1,13 @@ +{ lib, ... }: +let + vars = import ../vars.nix; +in +{ + services.audiobookshelf = { + enable = true; + openFirewall = true; + host = "192.168.90.40"; + }; + systemd.services.audiobookshelf.serviceConfig.WorkingDirectory = lib.mkForce "${vars.media_docker_configs}/audiobookshelf"; + users.users.audiobookshelf.home = lib.mkForce "${vars.media_docker_configs}/audiobookshelf"; +} diff --git a/systems/jeeves/services/validate_system.toml b/systems/jeeves/services/validate_system.toml index 18d4553..1be0522 100644 --- a/systems/jeeves/services/validate_system.toml +++ b/systems/jeeves/services/validate_system.toml @@ -1,13 +1,13 @@ zpool = ["root_pool", "storage", "torrenting", "media"] services = [ - "docker-audiobookshelf", + "audiobookshelf", "docker-cloud_flare_tunnel", - "docker-filebrowser", "docker-haproxy", "docker-qbit", "docker-qbitvpn", "docker-uptime_kuma", "docker", + "filebrowser", "home-assistant", "jellyfin", ]