From 55099d191ba4862b36b2c312ccf89ba7be32feb1 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Sat, 29 Jun 2024 00:59:49 -0400
Subject: [PATCH] condense docker options, fix nextcloud

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 systems/palatine-hill/docker.nix           | 5 -----
 systems/palatine-hill/docker/default.nix   | 1 +
 systems/palatine-hill/docker/nextcloud.nix | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 systems/palatine-hill/docker.nix

diff --git a/systems/palatine-hill/docker.nix b/systems/palatine-hill/docker.nix
deleted file mode 100644
index b79eb6f..0000000
--- a/systems/palatine-hill/docker.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  virtualisation.docker.daemon.settings.data-root = "/var/lib/docker2";
-}
diff --git a/systems/palatine-hill/docker/default.nix b/systems/palatine-hill/docker/default.nix
index 310593c..21f5bd0 100644
--- a/systems/palatine-hill/docker/default.nix
+++ b/systems/palatine-hill/docker/default.nix
@@ -13,6 +13,7 @@
   ];
 
   virtualisation.oci-containers.backend = "docker";
+  virtualisation.docker.daemon.settings.data-root = "/var/lib/docker2";
 
   # "nextcloud-go-vod-1 radialapps/go-vod"
   # "nextcloud-nextcloud-1 nextcloud-nextcloud"
diff --git a/systems/palatine-hill/docker/nextcloud.nix b/systems/palatine-hill/docker/nextcloud.nix
index a301923..a211deb 100644
--- a/systems/palatine-hill/docker/nextcloud.nix
+++ b/systems/palatine-hill/docker/nextcloud.nix
@@ -24,7 +24,7 @@ in
         "/ZFS/ZFS-primary/nextcloud/nc_php:/usr/local/etc/php"
         "/ZFS/ZFS-primary/nextcloud/nc_prehooks:/docker-entrypoint-hooks.d/before-starting"
       ];
-      extraOption = [
+      extraOptions = [
         "--network=haproxy-net"
         "--network=postgres-net"
         "--network=nextcloud_default"