diff options
| author | figsoda <figsoda@pm.me> | 2022-11-10 12:12:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 12:12:51 -0500 |
| commit | e920aed5214c6bf6a6e75bfd1b8fee2e8794e8ba (patch) | |
| tree | 768bcce44e429eae9d4043e8d9c7cca9ef7837ab /nixos/modules/services/databases | |
| parent | a72fc0d5b9966373c3855de0f721158ab05cf7ed (diff) | |
| parent | b4674b39c1928f05118ea0c1c4fb8ab66190edd6 (diff) | |
Merge pull request #200440 from nagy/treewide-modules
treewide: use `types.port` and `mkEnableOption` in nixos modules
Diffstat (limited to 'nixos/modules/services/databases')
| -rw-r--r-- | nixos/modules/services/databases/couchdb.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/databases/opentsdb.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/services/databases/pgmanage.nix | 2 |
3 files changed, 4 insertions, 16 deletions
diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix index 2a570d09a2c47..16b82b867a3d1 100644 --- a/nixos/modules/services/databases/couchdb.nix +++ b/nixos/modules/services/databases/couchdb.nix @@ -34,13 +34,7 @@ in { services.couchdb = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to run CouchDB Server. - ''; - }; + enable = mkEnableOption (lib.mdDoc "CouchDB Server"); package = mkOption { type = types.package; diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 45c84b12a50eb..288b716fce03f 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -15,13 +15,7 @@ in { services.opentsdb = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to run OpenTSDB. - ''; - }; + enable = mkEnableOption (lib.mdDoc "OpenTSDB"); package = mkOption { type = types.package; @@ -49,7 +43,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 4242; description = lib.mdDoc '' Which port OpenTSDB listens on. diff --git a/nixos/modules/services/databases/pgmanage.nix b/nixos/modules/services/databases/pgmanage.nix index 71ce1d8eca477..cbf988d596f46 100644 --- a/nixos/modules/services/databases/pgmanage.nix +++ b/nixos/modules/services/databases/pgmanage.nix @@ -85,7 +85,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = lib.mdDoc '' This tells pgmanage what port to listen on for browser requests. |