nixos/murmur: Use lib.types.path where possible

Signed-off-by: Felix Singer <felixsinger@posteo.net>

Changed files
+12 -12
nixos
modules
services
networking
+12 -12
nixos/modules/services/networking/murmur.nix
···
${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
certrequired=${lib.boolToString cfg.clientCertRequired}
-
${lib.optionalString (cfg.sslCert != "") "sslCert=${cfg.sslCert}"}
-
${lib.optionalString (cfg.sslKey != "") "sslKey=${cfg.sslKey}"}
-
${lib.optionalString (cfg.sslCa != "") "sslCA=${cfg.sslCa}"}
${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
···
clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
sslCert = lib.mkOption {
-
type = lib.types.str;
-
default = "";
description = "Path to your SSL certificate.";
};
sslKey = lib.mkOption {
-
type = lib.types.str;
-
default = "";
description = "Path to your SSL key.";
};
sslCa = lib.mkOption {
-
type = lib.types.str;
-
default = "";
description = "Path to your SSL CA certificate.";
};
···
+ lib.optionalString cfg.logToFile ''
rw /var/log/murmur/murmurd.log,
''
-
+ lib.optionalString (cfg.sslCert != "") ''
r ${cfg.sslCert},
''
-
+ lib.optionalString (cfg.sslKey != "") ''
r ${cfg.sslKey},
''
-
+ lib.optionalString (cfg.sslCa != "") ''
r ${cfg.sslCa},
''
+ lib.optionalString (cfg.dbus != null) ''
···
${lib.optionalString (cfg.registerHostname != "") "registerHostname=${cfg.registerHostname}"}
certrequired=${lib.boolToString cfg.clientCertRequired}
+
${lib.optionalString (cfg.sslCert != null) "sslCert=${cfg.sslCert}"}
+
${lib.optionalString (cfg.sslKey != null) "sslKey=${cfg.sslKey}"}
+
${lib.optionalString (cfg.sslCa != null) "sslCA=${cfg.sslCa}"}
${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"}
···
clientCertRequired = lib.mkEnableOption "requiring clients to authenticate via certificates";
sslCert = lib.mkOption {
+
type = lib.types.nullOr lib.types.path;
+
default = null;
description = "Path to your SSL certificate.";
};
sslKey = lib.mkOption {
+
type = lib.types.nullOr lib.types.path;
+
default = null;
description = "Path to your SSL key.";
};
sslCa = lib.mkOption {
+
type = lib.types.nullOr lib.types.path;
+
default = null;
description = "Path to your SSL CA certificate.";
};
···
+ lib.optionalString cfg.logToFile ''
rw /var/log/murmur/murmurd.log,
''
+
+ lib.optionalString (cfg.sslCert != null) ''
r ${cfg.sslCert},
''
+
+ lib.optionalString (cfg.sslKey != null) ''
r ${cfg.sslKey},
''
+
+ lib.optionalString (cfg.sslCa != null) ''
r ${cfg.sslCa},
''
+ lib.optionalString (cfg.dbus != null) ''