about summary refs log tree commit diff
path: root/nixos/modules/services/networking
diff options
context:
space:
mode:
authorpennae <82953136+pennae@users.noreply.github.com>2024-02-28 02:06:01 +0100
committerGitHub <noreply@github.com>2024-02-28 02:06:01 +0100
commitb71ca1c90abce2f71e1b16898de76990aef54bca (patch)
treeca98e2d3b0fde0de7d0644befb86ba038ac73dde /nixos/modules/services/networking
parent01973b05aab7a360606bba9453adf8d791d98fc2 (diff)
parent4c88c797b824053268426f8d8a2a8e1fbec2659c (diff)
downloadnixlib-b71ca1c90abce2f71e1b16898de76990aef54bca.tar
nixlib-b71ca1c90abce2f71e1b16898de76990aef54bca.tar.gz
nixlib-b71ca1c90abce2f71e1b16898de76990aef54bca.tar.bz2
nixlib-b71ca1c90abce2f71e1b16898de76990aef54bca.tar.lz
nixlib-b71ca1c90abce2f71e1b16898de76990aef54bca.tar.xz
nixlib-b71ca1c90abce2f71e1b16898de76990aef54bca.tar.zst
nixlib-b71ca1c90abce2f71e1b16898de76990aef54bca.zip
Merge pull request #291922 from NixOS/mosquitto-2
nixos/mosquitto: remove stutter in acl file name
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r--nixos/modules/services/networking/mosquitto.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 0aca263ae5b2..4a08f5ed2370 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -331,7 +331,7 @@ let
   formatListener = idx: listener:
     [
       "listener ${toString listener.port} ${toString listener.address}"
-      "acl_file /etc/mosquitto/mosquitto-acl-${toString idx}.conf"
+      "acl_file /etc/mosquitto/acl-${toString idx}.conf"
     ]
     ++ optional (! listener.omitPasswordAuth) "password_file ${cfg.dataDir}/passwd-${toString idx}"
     ++ formatFreeform {} listener.settings
@@ -690,7 +690,7 @@ in
     environment.etc = listToAttrs (
       imap0
         (idx: listener: {
-          name = "mosquitto/mosquitto-acl-${toString idx}.conf";
+          name = "mosquitto/acl-${toString idx}.conf";
           value = {
             user = config.users.users.mosquitto.name;
             group = config.users.users.mosquitto.group;