openvpn module: optionSet -> submodule

Changed files
+40 -38
nixos
modules
services
networking
+40 -38
nixos/modules/services/networking/openvpn.nix
···
attribute name.
'';
-
type = types.attrsOf types.optionSet;
-
options = {
-
config = mkOption {
-
type = types.lines;
-
description = ''
-
Configuration of this OpenVPN instance. See
-
<citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-
for details.
-
'';
-
};
-
up = mkOption {
-
default = "";
-
type = types.lines;
-
description = ''
-
Shell commands executed when the instance is starting.
-
'';
-
};
-
down = mkOption {
-
default = "";
-
type = types.lines;
-
description = ''
-
Shell commands executed when the instance is shutting down.
-
'';
-
};
-
autoStart = mkOption {
-
default = true;
-
type = types.bool;
-
description = "Whether this OpenVPN instance should be started automatically.";
-
};
-
updateResolvConf = mkOption {
-
default = false;
-
type = types.bool;
-
description = ''
-
Use the script from the update-resolv-conf package to automatically
-
update resolv.conf with the DNS information provided by openvpn. The
-
script will be run after the "up" commands and before the "down" commands.
-
'';
};
-
};
};
···
attribute name.
'';
+
type = with types; attrsOf (submodule {
+
options = {
+
config = mkOption {
+
type = types.lines;
+
description = ''
+
Configuration of this OpenVPN instance. See
+
<citerefentry><refentrytitle>openvpn</refentrytitle><manvolnum>8</manvolnum></citerefentry>
+
for details.
+
'';
+
};
+
up = mkOption {
+
default = "";
+
type = types.lines;
+
description = ''
+
Shell commands executed when the instance is starting.
+
'';
+
};
+
down = mkOption {
+
default = "";
+
type = types.lines;
+
description = ''
+
Shell commands executed when the instance is shutting down.
+
'';
+
};
+
autoStart = mkOption {
+
default = true;
+
type = types.bool;
+
description = "Whether this OpenVPN instance should be started automatically.";
+
};
+
+
updateResolvConf = mkOption {
+
default = false;
+
type = types.bool;
+
description = ''
+
Use the script from the update-resolv-conf package to automatically
+
update resolv.conf with the DNS information provided by openvpn. The
+
script will be run after the "up" commands and before the "down" commands.
+
'';
+
};
};
+
});
};