From 649fa4894c7909f118585e20c5f091c97efc90b3 Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Sat, 12 Nov 2022 18:11:51 +0100 Subject: [PATCH] Merge duplicate after options --- modules/nextcloud/default.nix | 3 +-- modules/ttrss-postgres/default.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix index 8d83e86..3ebe423 100644 --- a/modules/nextcloud/default.nix +++ b/modules/nextcloud/default.nix @@ -72,7 +72,6 @@ in environment.shellAliases = { occ = ''${pkgs.docker}/bin/docker exec -u www-data nextcloud php occ''; }; - systemd.services.${nextcloudService}.after = [ "mysql.service" ]; + systemd.services.${nextcloudService}.after = [ "mysql.service" "nginx.service" ]; systemd.services.${cronService}.after = [ "mysql.service" ]; - systemd.services.${nextcloudService}.after = [ "nginx.service" ]; } diff --git a/modules/ttrss-postgres/default.nix b/modules/ttrss-postgres/default.nix index d7fbf89..043a851 100644 --- a/modules/ttrss-postgres/default.nix +++ b/modules/ttrss-postgres/default.nix @@ -86,8 +86,7 @@ in internal; ''; }; - systemd.services.${ttrssService}.after = [ "postgresql.service" ]; + systemd.services.${ttrssService}.after = [ "nginx.service" "postgresql.service" ]; systemd.services.${backupService}.after = [ "postgresql.service" ]; systemd.services.${updaterService}.after = [ "postgresql.service" ]; - systemd.services.${ttrssService}.after = [ "nginx.service" ]; }