Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53de56c0cc28
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8791cad96b1b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 15, 2017

  1. Copy the full SHA
    d847b5c View commit details

Commits on Jun 27, 2017

  1. Merge pull request #26598 from moretea/mysql-add-bind-option

    mysql module: add option to bind to an address
    joachifm authored Jun 27, 2017
    1
    Copy the full SHA
    8791cad View commit details
Showing with 8 additions and 0 deletions.
  1. +8 −0 nixos/modules/services/databases/mysql.nix
8 changes: 8 additions & 0 deletions nixos/modules/services/databases/mysql.nix
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ let
''
[mysqld]
port = ${toString cfg.port}
${optionalString (cfg.bind != null) "bind-address = ${cfg.bind}" }
${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "log-bin=mysql-bin"}
${optionalString (cfg.replication.role == "master" || cfg.replication.role == "slave") "server-id = ${toString cfg.replication.serverId}"}
${optionalString (cfg.replication.role == "slave" && !atLeast55)
@@ -58,6 +59,13 @@ in
";
};

bind = mkOption {
type = types.nullOr types.str;
default = null;
example = literalExample "0.0.0.0";
description = "Address to bind to. The default it to bind to all addresses";
};

port = mkOption {
type = types.int;
default = 3306;