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 /nixos/modules/services/continuous-integration/gocd-server | |
parent | ffddcc8807df28c4a7232e4bf1e53b210e1b0276 (diff) | |
download | nixlib-e9342310297beb705d3bcf5caf1ad9a4ac59f392.tar nixlib-e9342310297beb705d3bcf5caf1ad9a4ac59f392.tar.gz nixlib-e9342310297beb705d3bcf5caf1ad9a4ac59f392.tar.bz2 nixlib-e9342310297beb705d3bcf5caf1ad9a4ac59f392.tar.lz nixlib-e9342310297beb705d3bcf5caf1ad9a4ac59f392.tar.xz nixlib-e9342310297beb705d3bcf5caf1ad9a4ac59f392.tar.zst nixlib-e9342310297beb705d3bcf5caf1ad9a4ac59f392.zip |
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).
Diffstat (limited to 'nixos/modules/services/continuous-integration/gocd-server')
-rw-r--r-- | nixos/modules/services/continuous-integration/gocd-server/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 2d1986301216..4bb792055d25 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 ''; |