diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2016-09-15 13:24:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-15 13:24:48 +0200 |
| commit | c571a7f221086b0eddc137e0083fcf17f67ca6f8 (patch) | |
| tree | 091bbf63212f00e966eda7837bfe402e6b43a1f7 /nixos/modules/services | |
| parent | 09646cc8a5810de0b4b2beb82e1b0bfa856cc644 (diff) | |
| parent | e9342310297beb705d3bcf5caf1ad9a4ac59f392 (diff) | |
| download | nixpkgs-c571a7f221086b0eddc137e0083fcf17f67ca6f8.tar nixpkgs-c571a7f221086b0eddc137e0083fcf17f67ca6f8.tar.gz nixpkgs-c571a7f221086b0eddc137e0083fcf17f67ca6f8.tar.bz2 nixpkgs-c571a7f221086b0eddc137e0083fcf17f67ca6f8.tar.lz nixpkgs-c571a7f221086b0eddc137e0083fcf17f67ca6f8.tar.xz nixpkgs-c571a7f221086b0eddc137e0083fcf17f67ca6f8.tar.zst nixpkgs-c571a7f221086b0eddc137e0083fcf17f67ca6f8.zip | |
Merge pull request #18500 from tvon/fix/gocd-server-options
gocd-server: add startupOptions, empty extraOptions
Diffstat (limited to 'nixos/modules/services')
| -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 21f319f7fcf..d60b55e83d1 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 2d198630121..4bb792055d2 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 ''; |