update the patch 0001-configure-web-admin-user.patch in order to work on tomcat 9 the change only adds a new user with manager-gui on second-last line instead of removing the past lines and then add the user
in any case, the changes on tomcat-user.xml must be done in order once all 3 patches touch the same line Signed-off-by: geraldo netto <[email protected]> --- .../perf/0001-configure-web-admin-user.patch | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tomcat/patches/perf/0001-configure-web-admin-user.patch b/tomcat/patches/perf/0001-configure-web-admin-user.patch index d445541..0dbb4ed 100644 --- a/tomcat/patches/perf/0001-configure-web-admin-user.patch +++ b/tomcat/patches/perf/0001-configure-web-admin-user.patch @@ -13,18 +13,11 @@ diff --git a/conf/tomcat-users.xml b/conf/tomcat-users.xml index 7f022ff..2f9579c 100644 --- a/conf/tomcat-users.xml +++ b/conf/tomcat-users.xml -@@ -26,11 +26,6 @@ - and thus are ignored when reading this file. Do not forget to remove - <!.. ..> that surrounds them. +@@ -41,4 +41,5 @@ + <user username="both" password="<must-be-changed>" roles="tomcat,role1"/> + <user username="role1" password="<must-be-changed>" roles="role1"/> --> --<!-- - <role rolename="tomcat"/> -- <role rolename="role1"/> -- <user username="tomcat" password="tomcat" roles="tomcat"/> -- <user username="both" password="tomcat" roles="tomcat,role1"/> -- <user username="role1" password="tomcat" roles="role1"/> ----> -+ <user username="tomcat" password="tomcat" roles="manager-gui"/> ++<user username="tomcat" password="tomcat" roles="manager-gui"/> </tomcat-users> -- 1.8.1.2 -- 2.17.1 -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
