From 9f0e3082bcd5153aafab9a39a3282c2872fa9886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Mon, 13 Jul 2020 21:39:31 +0100
Subject: [PATCH] Don't name dependsOn services docker-*.service

Apparently NixOS will handle this for us, automagically, but it isn't
quite smart enough to figure out when the user added that manually.
---
 etc/nixos/services/nextcloud.nix | 4 ++--
 etc/nixos/services/nginx.nix     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/nixos/services/nextcloud.nix b/etc/nixos/services/nextcloud.nix
index f5ed8e4..b259d6c 100644
--- a/etc/nixos/services/nextcloud.nix
+++ b/etc/nixos/services/nextcloud.nix
@@ -4,7 +4,7 @@
   networked-docker-containers = {
     nextcloud = {
       image = "nextcloud:fpm-alpine";
-      dependsOn = ["docker-nextcloud-postgres.service"];
+      dependsOn = ["nextcloud-postgres"];
       volumes = [
         "nextcloud-apps:/var/www/html/custom_apps"
         "nextcloud-config:/var/www/html/config"
@@ -26,7 +26,7 @@
 
     nextcloud-nginx = {
       image = "nginx:alpine";
-      dependsOn = ["docker-nextcloud.service"];
+      dependsOn = ["nextcloud"];
       environment = {
         LETSENCRYPT_HOST = "nextcloud.tlater.net";
         VIRTUAL_HOST = "nextcloud.tlater.net";
diff --git a/etc/nixos/services/nginx.nix b/etc/nixos/services/nginx.nix
index 8ef5826..f637a87 100644
--- a/etc/nixos/services/nginx.nix
+++ b/etc/nixos/services/nginx.nix
@@ -29,7 +29,7 @@
 
     nginx-proxy-letsencrypt = {
       image = "jrcs/letsencrypt-nginx-proxy-companion";
-      dependsOn = ["docker-nginx-proxy.service"];
+      dependsOn = ["nginx-proxy"];
       volumes = [
         "/var/run/docker.sock:/var/run/docker.sock:ro"
         "nginx-certs:/etc/nginx/certs"