diff --git a/README.md b/README.md index 69dda78b98..85423ea2e9 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Since JSPWiki 2.1.153, JSPWiki comes with a really simple installation engine. Just do the following: 1) Install Tomcat from https://tomcat.apache.org/ (or any other servlet - container) + container) and unzip it somewhere. 2) Rename the JSPWiki.war file from the download and rename it based on your desired URL (if you want it different from /JSPWiki). For example, diff --git a/jspwiki-main/src/main/resources/ini/jspwiki.properties b/jspwiki-main/src/main/resources/ini/jspwiki.properties index 167c8b1352..eea8691f27 100644 --- a/jspwiki-main/src/main/resources/ini/jspwiki.properties +++ b/jspwiki-main/src/main/resources/ini/jspwiki.properties @@ -667,6 +667,10 @@ jspwiki.aclManager = org.apache.wiki.auth.acl.DefaultAclManager # Secure Cookie flag, when setting a browser cookie, this will set the # secure flag to true and the http flag to true. # set to false if you're using non-SSL/TLS connections +# in most cases, you want this set to true. +# when it is true, it may trigger authentication issues +# when accessing the wiki over http. if that causes you issues, +# switch to TLS or set this to false (insecure). jspwiki.securecookie = true ############################################################################# diff --git a/pom.xml b/pom.xml index 7a756aebab..bededa6e0e 100644 --- a/pom.xml +++ b/pom.xml @@ -892,7 +892,17 @@ standalone ${project.build.directory}/tomcat10x + http 8080 + + -Xms256m -Xmx3072m -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:+DisableExplicitGC -Xverify:none -Djava.awt.headless=true