diff options
author | Shawn Warren <shawn.warren@rackspace.com> | 2016-07-27 11:44:28 -0500 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2016-07-27 18:44:28 +0200 |
commit | 7234275cd558b82e291d55e3ceed61840bcb8465 (patch) | |
tree | f3fb64a84d2819568218fcc6a075fc036354ee9a /nixos/modules/services/continuous-integration | |
parent | 14e807192169ee51afee15e273dbec101197d49b (diff) | |
download | nixlib-7234275cd558b82e291d55e3ceed61840bcb8465.tar nixlib-7234275cd558b82e291d55e3ceed61840bcb8465.tar.gz nixlib-7234275cd558b82e291d55e3ceed61840bcb8465.tar.bz2 nixlib-7234275cd558b82e291d55e3ceed61840bcb8465.tar.lz nixlib-7234275cd558b82e291d55e3ceed61840bcb8465.tar.xz nixlib-7234275cd558b82e291d55e3ceed61840bcb8465.tar.zst nixlib-7234275cd558b82e291d55e3ceed61840bcb8465.zip |
bump gocd-server version to 16.6.0-3590 (#17304)
Update gocd-server package version to 16.6.0-3590 including new sha. Modify heapSize and maxMemory mkOption to accurately reflect their intended purpose of configuring initial java heap sizes.
Diffstat (limited to 'nixos/modules/services/continuous-integration')
-rw-r--r-- | nixos/modules/services/continuous-integration/gocd-server/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index f0d9d6f53c83..2d1986301216 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -67,33 +67,33 @@ in { }; packages = mkOption { - default = [ pkgs.stdenv pkgs.jre config.programs.ssh.package pkgs.nix ]; + default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD server's process. ''; }; - heapSize = mkOption { + initialJavaHeapSize = mkOption { default = "512m"; type = types.str; description = '' - Specifies the java heap memory size for the Go.CD server's java process. + Specifies the initial java heap memory size for the Go.CD server's java process. ''; }; - maxMemory = mkOption { + maxJavaHeapMemory = mkOption { default = "1024m"; type = types.str; description = '' - Specifies the java maximum memory size for the Go.CD server's java process. + Specifies the java maximum heap memory size for the Go.CD server's java process. ''; }; extraOptions = mkOption { default = [ - "-Xms${cfg.heapSize}" - "-Xmx${cfg.maxMemory}" + "-Xms${cfg.initialJavaHeapSize}" + "-Xmx${cfg.maxJavaHeapMemory}" "-Dcruise.listen.host=${cfg.listenAddress}" "-Duser.language=en" "-Djruby.rack.request.size.threshold.bytes=30000000" |