diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2022-03-14 13:37:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 13:37:49 +0000 |
| commit | 247a1809a4a7f45c2d5ff47700063fab0b800830 (patch) | |
| tree | 03c8c47e4fc898efa86ad58a44146bd82b9d6e3e /nixos/modules | |
| parent | 3cd42bee12ceb329a404356389b6e0aa353d45eb (diff) | |
| parent | 4ea5398d20cf110b84800e91f30a3dfce96c1b4e (diff) | |
| download | nixpkgs-247a1809a4a7f45c2d5ff47700063fab0b800830.tar nixpkgs-247a1809a4a7f45c2d5ff47700063fab0b800830.tar.gz nixpkgs-247a1809a4a7f45c2d5ff47700063fab0b800830.tar.bz2 nixpkgs-247a1809a4a7f45c2d5ff47700063fab0b800830.tar.lz nixpkgs-247a1809a4a7f45c2d5ff47700063fab0b800830.tar.xz nixpkgs-247a1809a4a7f45c2d5ff47700063fab0b800830.tar.zst nixpkgs-247a1809a4a7f45c2d5ff47700063fab0b800830.zip | |
Merge pull request #163431 from nazarewk/update-plantuml-server
plantuml-server 1.2021.12 -> 1.2022.2
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/web-apps/plantuml-server.nix | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index f4bf43f56b9..9ea37b8a4ca 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -20,6 +20,21 @@ in description = "PlantUML server package to use"; }; + packages = { + jdk = mkOption { + type = types.package; + default = pkgs.jdk; + defaultText = literalExpression "pkgs.jdk"; + description = "JDK package to use for the server"; + }; + jetty = mkOption { + type = types.package; + default = pkgs.jetty; + defaultText = literalExpression "pkgs.jetty"; + description = "Jetty package to use for the server"; + }; + }; + user = mkOption { type = types.str; default = "plantuml"; @@ -105,10 +120,10 @@ in ALLOW_PLANTUML_INCLUDE = if cfg.allowPlantumlInclude then "true" else "false"; }; script = '' - ${pkgs.jre}/bin/java \ - -jar ${pkgs.jetty}/start.jar \ + ${cfg.packages.jdk}/bin/java \ + -jar ${cfg.packages.jetty}/start.jar \ --module=deploy,http,jsp \ - jetty.home=${pkgs.jetty} \ + jetty.home=${cfg.packages.jetty} \ jetty.base=${cfg.package} \ jetty.http.host=${cfg.listenHost} \ jetty.http.port=${builtins.toString cfg.listenPort} |