diff options
author | Austin Seipp <aseipp@pobox.com> | 2018-05-01 02:17:46 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2018-05-01 15:47:36 -0500 |
commit | 5a24d99fa628169c9fdeb37d3437cc3e7fa521ac (patch) | |
tree | a5b6032200f667e8274a31a52e41899b044d1b9d /nixos/modules/services/databases/foundationdb.nix | |
parent | 55eec81118574b607ad7cfe9c26919134bcc2365 (diff) |
foundationdb: split into multiple, major-versioned packages to make upgrades user-controllable
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'nixos/modules/services/databases/foundationdb.nix')
-rw-r--r-- | nixos/modules/services/databases/foundationdb.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 443cc6d5e456..693d2fde9916 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.services.foundationdb; + pkg = cfg.package; # used for initial cluster configuration initialIpAddr = if (cfg.publicAddress != "auto") then cfg.publicAddress else "127.0.0.1"; @@ -24,7 +25,7 @@ let group = ${cfg.group} [fdbserver] - command = ${pkgs.foundationdb}/bin/fdbserver + command = ${pkg}/bin/fdbserver public_address = ${cfg.publicAddress}:$ID listen_address = ${cfg.listenAddress} datadir = ${cfg.dataDir}/$ID @@ -36,7 +37,7 @@ let storage_memory = ${cfg.storageMemory} ${optionalString (cfg.tls != null) '' - tls_plugin = ${pkgs.foundationdb}/libexec/plugins/FDBLibTLS.so + tls_plugin = ${pkg}/libexec/plugins/FDBLibTLS.so tls_certificate_file = ${cfg.tls.certificate} tls_key_file = ${cfg.tls.key} tls_verify_peers = ${cfg.tls.allowedPeers} @@ -50,7 +51,7 @@ let ${fdbServers cfg.serverProcesses} [backup_agent] - command = ${pkgs.foundationdb}/libexec/backup_agent + command = ${pkg}/libexec/backup_agent ${backupAgents cfg.backupProcesses} ''; in @@ -59,6 +60,14 @@ in enable = mkEnableOption "FoundationDB Server"; + package = mkOption { + type = types.package; + description = '' + The FoundationDB package to use for this server. This must be specified by the user + in order to ensure migrations and upgrades are controlled appropriately. + ''; + }; + publicAddress = mkOption { type = types.str; default = "auto"; @@ -314,7 +323,7 @@ in meta.doc = ./foundationdb.xml; meta.maintainers = with lib.maintainers; [ thoughtpolice ]; - environment.systemPackages = [ pkgs.foundationdb ]; + environment.systemPackages = [ pkg ]; users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton { name = "foundationdb"; @@ -368,7 +377,7 @@ in ReadWritePaths = lib.concatStringsSep " " (map (x: "-" + x) rwpaths); }; - path = [ pkgs.foundationdb pkgs.coreutils ]; + path = [ pkg pkgs.coreutils ]; preStart = '' rm -f ${cfg.pidfile} && \ |