summary refs log tree commit diff
path: root/nixos/modules/services/web-apps
diff options
context:
space:
mode:
authorCrystalGamma <dev@crystalgamma.de>2022-08-24 10:37:38 +0200
committerzowoq <59103226+zowoq@users.noreply.github.com>2022-08-24 19:02:39 +1000
commitf02151af242aa68dd1749b3946c646dc0294c4d9 (patch)
tree1c2c55bfa9e351513aecba4744f40e0b3afc6239 /nixos/modules/services/web-apps
parent095d1fe4bd6695066da22f4c83a89b7f92216d9c (diff)
downloadnixpkgs-f02151af242aa68dd1749b3946c646dc0294c4d9.tar
nixpkgs-f02151af242aa68dd1749b3946c646dc0294c4d9.tar.gz
nixpkgs-f02151af242aa68dd1749b3946c646dc0294c4d9.tar.bz2
nixpkgs-f02151af242aa68dd1749b3946c646dc0294c4d9.tar.lz
nixpkgs-f02151af242aa68dd1749b3946c646dc0294c4d9.tar.xz
nixpkgs-f02151af242aa68dd1749b3946c646dc0294c4d9.tar.zst
nixpkgs-f02151af242aa68dd1749b3946c646dc0294c4d9.zip
nixos/jitsi-meet: fix property conflict
#167013 introduced a property conflict with the concurrently-written commit
aea940da63c27f503915a5ca44cbb9eddf2674f6, over property
systemd.services.prosody. Fix this by moving the reload option into the block.
Diffstat (limited to 'nixos/modules/services/web-apps')
-rw-r--r--nixos/modules/services/web-apps/jitsi-meet.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix
index a50ba022615..ecc00c7899b 100644
--- a/nixos/modules/services/web-apps/jitsi-meet.nix
+++ b/nixos/modules/services/web-apps/jitsi-meet.nix
@@ -267,8 +267,8 @@ in
         EnvironmentFile = [ "/var/lib/jitsi-meet/secrets-env" ];
         SupplementaryGroups = [ "jitsi-meet" ];
       };
+      reloadIfChanged = true;
     };
-    systemd.services.prosody.reloadIfChanged = mkIf cfg.prosody.enable true;
 
     users.groups.jitsi-meet = {};
     systemd.tmpfiles.rules = [