Merge pull request #205056 from nagy/ports

2022-12-08 09:59:05 +01:00 · 2022-12-08 09:59:05 +01:00 · de1d457b60
commit de1d457b60
parent 0e50858afb ad866e565d
26 changed files with 36 additions and 36 deletions
--- a/nixos/modules/services/audio/icecast.nix
+++ b/nixos/modules/services/audio/icecast.nix
@ -74,7 +74,7 @@ in {

      listen = {
        port = mkOption {
-          type = types.int;
+          type = types.port;
          description = lib.mdDoc "TCP port that will be used to accept client connections.";
          default = 8000;
        };
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@ -142,7 +142,7 @@ in {
        };

        port = mkOption {
-          type = types.int;
+          type = types.port;
          default = 6600;
          description = lib.mdDoc ''
            This setting is the TCP port that is desired for the daemon to get assigned
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@ -171,7 +171,7 @@ in
      port = mkOption {
        description = lib.mdDoc "Kubernetes kubelet healthz port.";
        default = 10248;
-        type = int;
+        type = port;
      };
    };

@ -204,7 +204,7 @@ in
    port = mkOption {
      description = lib.mdDoc "Kubernetes kubelet info server listening port.";
      default = 10250;
-      type = int;
+      type = port;
    };

    seedDockerImages = mkOption {
--- a/nixos/modules/services/cluster/kubernetes/scheduler.nix
+++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix
@ -43,7 +43,7 @@ in
    port = mkOption {
      description = lib.mdDoc "Kubernetes scheduler listening port.";
      default = 10251;
-      type = int;
+      type = port;
    };

    verbosity = mkOption {
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@ -206,7 +206,7 @@ in {

      port = mkOption {
        default = 8010;
-        type = types.int;
+        type = types.port;
        description = lib.mdDoc "Specifies port number on which the buildbot HTTP interface listens.";
      };

--- a/nixos/modules/services/development/jupyter/default.nix
+++ b/nixos/modules/services/development/jupyter/default.nix
@ -57,7 +57,7 @@ in {
    };

    port = mkOption {
-      type = types.int;
+      type = types.port;
      default = 8888;
      description = lib.mdDoc ''
        Port number Jupyter will be listening on.
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@ -560,7 +560,7 @@ in {
          description = lib.mdDoc "GitLab container registry host name.";
        };
        port = mkOption {
-          type = types.int;
+          type = types.port;
          default = 4567;
          description = lib.mdDoc "GitLab container registry port.";
        };
@ -613,7 +613,7 @@ in {
        };

        port = mkOption {
-          type = types.int;
+          type = types.port;
          default = 25;
          description = lib.mdDoc "Port of the SMTP server for GitLab.";
        };
--- a/nixos/modules/services/misc/ripple-data-api.nix
+++ b/nixos/modules/services/misc/ripple-data-api.nix
@ -40,7 +40,7 @@ in {
      port = mkOption {
        description = lib.mdDoc "Ripple data api port";
        default = 5993;
-        type = types.int;
+        type = types.port;
      };

      importMode = mkOption {
@ -77,7 +77,7 @@ in {
        port = mkOption {
          description = lib.mdDoc "Ripple data api redis port.";
          default = 5984;
-          type = types.int;
+          type = types.port;
        };
      };

@ -91,7 +91,7 @@ in {
        port = mkOption {
          description = lib.mdDoc "Ripple data api couchdb port.";
          default = 5984;
-          type = types.int;
+          type = types.port;
        };

        db = mkOption {
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@ -225,7 +225,7 @@ in {
      port = mkOption {
        description = lib.mdDoc "Seyren listening port.";
        default = 8081;
-        type = types.int;
+        type = types.port;
      };

      seyrenUrl = mkOption {
--- a/nixos/modules/services/monitoring/kapacitor.nix
+++ b/nixos/modules/services/monitoring/kapacitor.nix
@ -66,7 +66,7 @@ in
    };

    port = mkOption {
-      type = types.int;
+      type = types.port;
      default = 9092;
      description = lib.mdDoc "Port of Kapacitor";
    };
--- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix
+++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix
@ -107,7 +107,7 @@ in {
      };

      port = mkOption {
-        type = types.int;
+        type = types.port;
        default = 9093;
        description = lib.mdDoc ''
          Port to listen on for the web interface and API.
--- a/nixos/modules/services/monitoring/zabbix-proxy.nix
+++ b/nixos/modules/services/monitoring/zabbix-proxy.nix
@ -102,7 +102,7 @@ in
        };

        port = mkOption {
-          type = types.int;
+          type = types.port;
          default = if cfg.database.type == "mysql" then mysql.port else pgsql.port;
          defaultText = literalExpression ''
            if config.${opt.database.type} == "mysql"
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@ -18,7 +18,7 @@ in
            };
            tub.port = mkOption {
              default = 3458;
-              type = types.int;
+              type = types.port;
              description = lib.mdDoc ''
                The port on which the introducer will listen.
              '';
@ -58,7 +58,7 @@ in
            };
            tub.port = mkOption {
              default = 3457;
-              type = types.int;
+              type = types.port;
              description = lib.mdDoc ''
                The port on which the tub will listen.

@ -80,7 +80,7 @@ in
            };
            web.port = mkOption {
              default = 3456;
-              type = types.int;
+              type = types.port;
              description = lib.mdDoc ''
                The port on which the Web server will listen.

--- a/nixos/modules/services/networking/morty.nix
+++ b/nixos/modules/services/networking/morty.nix
@ -50,7 +50,7 @@ in
      };

      port = mkOption {
-        type = types.int;
+        type = types.port;
        default = 3000;
        description = lib.mdDoc "Listing port";
      };
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@ -588,7 +588,7 @@ in
    };

    port = mkOption {
-      type = types.int;
+      type = types.port;
      default = 53;
      description = lib.mdDoc ''
        Port the service should bind do.
@ -825,7 +825,7 @@ in
      };

      port = mkOption {
-        type = types.int;
+        type = types.port;
        default = 8952;
        description = lib.mdDoc ''
          Port number for remote control operations (uses TLS over TCP).
--- a/nixos/modules/services/networking/nylon.nix
+++ b/nixos/modules/services/networking/nylon.nix
@ -81,7 +81,7 @@ let
      };

      port = mkOption {
-        type = types.int;
+        type = types.port;
        default = 1080;
        description = lib.mdDoc ''
          What port to listen for client requests, default is 1080.
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@ -38,7 +38,7 @@ in {
    };

    dns.port = mkOption {
-      type = types.int;
+      type = types.port;
      default = 53;
      description = lib.mdDoc ''
        Port number Recursor DNS server will bind to.
@ -67,7 +67,7 @@ in {
    };

    api.port = mkOption {
-      type = types.int;
+      type = types.port;
      default = 8082;
      description = lib.mdDoc ''
        Port number Recursor REST API server will bind to.
--- a/nixos/modules/services/networking/redsocks.nix
+++ b/nixos/modules/services/networking/redsocks.nix
@ -81,7 +81,7 @@ in
          };

          port = mkOption {
-            type = types.int;
+            type = types.port;
            default = 12345;
            description = lib.mdDoc "Port on which redsocks should listen.";
          };
--- a/nixos/modules/services/networking/znc/options.nix
+++ b/nixos/modules/services/networking/znc/options.nix
@ -18,7 +18,7 @@ let
      };

      port = mkOption {
-        type = types.ints.u16;
+        type = types.port;
        default = 6697;
        description = lib.mdDoc ''
          IRC server port.
@ -188,7 +188,7 @@ in

        port = mkOption {
          default = 5000;
-          type = types.int;
+          type = types.port;
          description = lib.mdDoc ''
            Specifies the port on which to listen.
          '';
--- a/nixos/modules/services/search/elasticsearch-curator.nix
+++ b/nixos/modules/services/search/elasticsearch-curator.nix
@ -50,7 +50,7 @@ in {
    };
    port = mkOption {
      description = lib.mdDoc "the port that elasticsearch is listening on";
-      type = types.int;
+      type = types.port;
      default = 9200;
    };
    actionYAML = mkOption {
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@ -66,7 +66,7 @@ in
    port = mkOption {
      description = lib.mdDoc "Elasticsearch port to listen for HTTP traffic.";
      default = 9200;
-      type = types.int;
+      type = types.port;
    };

    tcp_port = mkOption {
--- a/nixos/modules/services/web-apps/hedgedoc.nix
+++ b/nixos/modules/services/web-apps/hedgedoc.nix
@ -449,7 +449,7 @@ in
              '';
            };
            port = mkOption {
-              type = types.int;
+              type = types.port;
              default = 9000;
              description = lib.mdDoc ''
                Minio listen port.
--- a/nixos/modules/services/web-apps/limesurvey.nix
+++ b/nixos/modules/services/web-apps/limesurvey.nix
@ -49,7 +49,7 @@ in
      };

      port = mkOption {
-        type = types.int;
+        type = types.port;
        default = if cfg.database.type == "pgsql" then 5442 else 3306;
        defaultText = literalExpression "3306";
        description = lib.mdDoc "Database host port.";
--- a/nixos/modules/services/web-apps/moodle.nix
+++ b/nixos/modules/services/web-apps/moodle.nix
@ -96,7 +96,7 @@ in
      };

      port = mkOption {
-        type = types.int;
+        type = types.port;
        description = lib.mdDoc "Database host port.";
        default = {
          mysql = 3306;
--- a/nixos/modules/services/web-apps/zabbix.nix
+++ b/nixos/modules/services/web-apps/zabbix.nix
@ -51,7 +51,7 @@ in

      server = {
        port = mkOption {
-          type = types.int;
+          type = types.port;
          description = lib.mdDoc "The port of the Zabbix server to connect to.";
          default = 10051;
        };
@ -78,7 +78,7 @@ in
        };

        port = mkOption {
-          type = types.int;
+          type = types.port;
          default =
            if cfg.database.type == "mysql" then config.services.mysql.port
            else if cfg.database.type == "pgsql" then config.services.postgresql.port
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@ -29,7 +29,7 @@ with lib;
    listen = mkOption {
      type = with types; listOf (submodule { options = {
        addr = mkOption { type = str;  description = lib.mdDoc "IP address.";  };
-        port = mkOption { type = int;  description = lib.mdDoc "Port number."; default = 80; };
+        port = mkOption { type = port;  description = lib.mdDoc "Port number."; default = 80; };
        ssl  = mkOption { type = bool; description = lib.mdDoc "Enable SSL.";  default = false; };
        extraParameters = mkOption { type = listOf str; description = lib.mdDoc "Extra parameters of this listen directive."; default = []; example = [ "backlog=1024" "deferred" ]; };
      }; });