ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 04:27:27 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #311381 from minijackson/tomcat-port

Browse Source 
nixos/tomcat: add 'port' option
This commit is contained in:
Sandro 2024-06-26 00:53:58 +02:00 committed by GitHub
commit 08605eec2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/web-servers/tomcat.nix
View File

@ -21,6 +21,14 @@ in
example = "tomcat10";
};
port = lib.mkOption {
type = lib.types.port;
default = 8080;
description = ''
The TCP port Tomcat should listen on.
'';
};
purifyOnStart = lib.mkOption {
type = lib.types.bool;
default = false;
@ -244,8 +252,12 @@ in
hostElementsString = lib.concatMapStringsSep "\n" hostElementForVirtualHost cfg.virtualHosts;
hostElementsSedString = lib.replaceStrings ["\n"] ["\\\n"] hostElementsString;
in ''
# Create a modified server.xml which also includes all virtual hosts
sed -e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\\"${lib.escapeShellArg hostElementsSedString} \
# Create a modified server.xml which listens on the given port,
# and also includes all virtual hosts.
# The host modification must be last here,
# else if hostElementsSedString is empty sed gets confused as to what to append
sed -e 's/<Connector port="8080"/<Connector port="${toString cfg.port}"/' \
-e "/<Engine name=\"Catalina\" defaultHost=\"localhost\">/a\\"${lib.escapeShellArg hostElementsSedString} \
${tomcat}/conf/server.xml > ${cfg.baseDir}/conf/server.xml
''
}

9
nixos/tests/tomcat.nix
View File

@ -5,23 +5,24 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
nodes.machine = { pkgs, ... }: {
services.tomcat = {
enable = true;
port = 8001;
axis2.enable = true;
};
};
testScript = ''
machine.wait_for_unit("tomcat.service")
machine.wait_for_open_port(8080)
machine.wait_for_open_port(8001)
machine.wait_for_file("/var/tomcat/webapps/examples");
machine.succeed(
"curl -sS --fail http://localhost:8080/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'"
"curl -sS --fail http://localhost:8001/examples/servlets/servlet/HelloWorldExample | grep 'Hello World!'"
)
machine.succeed(
"curl -sS --fail http://localhost:8080/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'"
"curl -sS --fail http://localhost:8001/examples/jsp/jsp2/simpletag/hello.jsp | grep 'Hello, world!'"
)
machine.succeed(
"curl -sS --fail http://localhost:8080/axis2/axis2-web/HappyAxis.jsp | grep 'Found Axis2'"
"curl -sS --fail http://localhost:8001/axis2/axis2-web/HappyAxis.jsp | grep 'Found Axis2'"
)
'';
})