Merge pull request #62 from alyssais/str

types.string -> types.str
nixcloud · Sep 10, 2019 · 14c91e0 · 14c91e0
2 parents f4929ec + d5e6a46
commit 14c91e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/modules/services/email/postfix.nix b/modules/services/email/postfix.nix
@@ -583,7 +583,7 @@ in
 
       dnsBlacklists = mkOption {
         default = [];
-        type = with types; listOf string;
+        type = with types; listOf str;
         description = "dns blacklist servers to use with smtpd_client_restrictions";
       };
 

diff --git a/modules/services/reverse-proxy/options.nix b/modules/services/reverse-proxy/options.nix
@@ -300,7 +300,7 @@ in
       '';
     };
     TLS = mkOption {
-      type = types.string;
+      type = types.str;
       apply = x: assert (x != "ACME") || abort "Your proxyOptions.TLS or extraMappings.TLS definition was \"ACME\" but the changed implementation for proxyOptions expects now a nixcloud.TLS.certs identifier instead. \nEither\n * remove the TLS definition completely and use the default which is probably what you want or\n * select properly defined nixcloud.TLS identifier instead"; x;
       description = ''
         Points to an identifier <replaceable>myconfig</replaceable>, which is

diff --git a/modules/virtualisation/container.nix b/modules/virtualisation/container.nix
@@ -13,7 +13,7 @@ with lib;
           description = "Enable nixcloud LXC based container support";
         };
         internetInterface = mkOption {
-          type = types.string;
+          type = types.str;
           default = "enp0s3";
           example = "enp4s0";
           description = ''
@@ -54,13 +54,13 @@ with lib;
                 description = "Enable/disable IPv6 support for nixcloud.container";
               };
               ipv6InternetInterfaceAddress = mkOption {
-                type = types.string;
+                type = types.str;
                 example = "2001:db8:3c4d:15::1";
                 default = "";
                 description = "The IPv6 address which is assigned to the DHCPD6 interface and must be contained in the `ipv6Prefix` as DHCPD6 wouldn't work otherwise.";
               };
               ipv6Prefix = mkOption {
-                type = types.string;
+                type = types.str;
                 default = "";
                 example = "2001:db8:3c4d:15::";
                 description = "See https://www.google.de/search?q=ipv6+prefix";
@@ -72,7 +72,7 @@ with lib;
                 description = "See https://www.google.de/search?q=ipv6+prefix";
               };
               ipv6NameServers = mkOption {
-                type = types.listOf (types.string);
+                type = types.listOf (types.str);
                 default = [];
                 example = [ "2a01:4f8:0:1::add:1010" "2a01:4f8:0:1::add:9999" "2a01:4f8:0:1::add:9898" ];
                 description = "A list of IPv6 nameservers which are used in the LXC guests to resolve DNS requets via IPv6";