diff options
author | Tom von Schwerdtner <tomvons@gmail.com> | 2016-09-10 17:41:40 -0400 |
---|---|---|
committer | Tom von Schwerdtner <tomvons@gmail.com> | 2016-09-10 17:52:06 -0400 |
commit | e9342310297beb705d3bcf5caf1ad9a4ac59f392 (patch) | |
tree | af50693356c137c825a531516fe5f058e3081209 | |
parent | ffddcc8807df28c4a7232e4bf1e53b210e1b0276 (diff) |
gocd-server: add startupOptions, empty extraOptions
The extraOptions option has default values which seems surprising. This moves those values to startupOptions (which is what gocd-agent uses) and empties out the default extraOptions. The gocd-agent startupOptions description was also changed to remove the mention of the example (given there isn't one).
-rw-r--r-- | nixos/modules/services/continuous-integration/gocd-agent/default.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/continuous-integration/gocd-server/default.nix | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 21f319f7fcf62..d60b55e83d11b 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -98,7 +98,7 @@ in { ]; description = '' Specifies startup command line arguments to pass to Go.CD agent - java process. Example contains debug and gcLog arguments. + java process. ''; }; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 2d19863012168..4bb792055d254 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -90,7 +90,7 @@ in { ''; }; - extraOptions = mkOption { + startupOptions = mkOption { default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -103,6 +103,15 @@ in { "-Dcruise.server.port=${toString cfg.port}" "-Dcruise.server.ssl.port=${toString cfg.sslPort}" ]; + + description = '' + Specifies startup command line arguments to pass to Go.CD server + java process. + ''; + }; + + extraOptions = mkOption { + default = [ ]; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" @@ -169,7 +178,8 @@ in { script = '' ${pkgs.git}/bin/git config --global --add http.sslCAinfo /etc/ssl/certs/ca-certificates.crt - ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.extraOptions} \ + ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.startupOptions} \ + ${concatStringsSep " " cfg.extraOptions} \ -jar ${pkgs.gocd-server}/go-server/go.jar ''; |