Merge pull request #18511 from ericsagnes/feat/remove-optionSet

modules: optionSet -> submodule
2016-10-01 17:57:45 +02:00
parent 46693bd6e8 f923905346
commit 7e80c42b0e
28 changed files with 1101 additions and 1108 deletions
@@ -129,11 +129,10 @@ in

      certs = mkOption {
        default = { };
-        type = types.loaOf types.optionSet;
+        type = with types; loaOf (submodule certOpts);
        description = ''
          Attribute set of certificates to get signed and renewed.
        '';
-        options = [ certOpts ];
        example = {
          "example.com" = {
            webroot = "/var/www/challenges/";
@@ -386,8 +386,7 @@ in

    security.pam.services = mkOption {
      default = [];
-      type = types.loaOf types.optionSet;
-      options = [ pamOpts ];
+      type = with types; loaOf (submodule pamOpts);
      description =
        ''
          This option defines the PAM services.  A service typically