diff options
author | tv <tv@krebsco.de> | 2023-03-02 09:20:37 +0100 |
---|---|---|
committer | tv <tv@krebsco.de> | 2023-03-02 09:20:37 +0100 |
commit | 03a9448a0922fcf158c4357922bed689245105e3 (patch) | |
tree | 7dbedf90d0443bd1e375aac61f63735f43e64984 /lass/1systems/prism/config.nix | |
parent | 177fd1eeec05f0821f1ccc63733b3e0fd5aed7b6 (diff) | |
parent | 8639d428c2e9f2190ec4e4b5dd931f24a4166f36 (diff) |
Merge remote-tracking branch 'prism/master' into head
Diffstat (limited to 'lass/1systems/prism/config.nix')
-rw-r--r-- | lass/1systems/prism/config.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lass/1systems/prism/config.nix b/lass/1systems/prism/config.nix index bcc8c1a08..2e82fae6f 100644 --- a/lass/1systems/prism/config.nix +++ b/lass/1systems/prism/config.nix @@ -134,10 +134,9 @@ with import <stockholm/lib>; <stockholm/lass/2configs/reaktor-coders.nix> <stockholm/lass/2configs/ciko.nix> <stockholm/lass/2configs/container-networking.nix> - <stockholm/lass/2configs/jitsi.nix> + <stockholm/lass/2configs/services/coms/jitsi.nix> <stockholm/lass/2configs/fysiirc.nix> <stockholm/lass/2configs/bgt-bot> - <stockholm/lass/2configs/mumble-reminder.nix> <stockholm/krebs/2configs/mastodon-proxy.nix> { services.tor = { @@ -281,7 +280,7 @@ with import <stockholm/lib>; { predicate = "-p udp --dport 60000:61000"; target = "ACCEPT"; } ]; } - <stockholm/lass/2configs/murmur.nix> + <stockholm/lass/2configs/services/coms/murmur.nix> <stockholm/lass/2configs/docker.nix> { systemd.services."container@yellow".reloadIfChanged = mkForce false; |