Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions jspwiki-main/src/main/resources/ini/jspwiki.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

#############################################################################
Expand Down
10 changes: 10 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,17 @@
<type>standalone</type>
<home>${project.build.directory}/tomcat10x</home>
<properties>
<cargo.protocol>http</cargo.protocol>
<cargo.servlet.port>8080</cargo.servlet.port>
<!--example for cargo plugin with https-->
<!--
<cargo.protocol>https</cargo.protocol>
<cargo.servlet.port>8443</cargo.servlet.port>
<cargo.tomcat.httpSecure>true</cargo.tomcat.httpSecure>
<cargo.tomcat.connector.sslProtocol>TLS</cargo.tomcat.connector.sslProtocol>
<cargo.tomcat.connector.keystoreFile>${project.basedir}/../jspwiki-portable/src/overlay/tomcat/conf/test-use-only.p12</cargo.tomcat.connector.keystoreFile>
<cargo.tomcat.connector.keystorePass></cargo.tomcat.connector.keystorePass>
-->
<cargo.jvmargs>-Xms256m -Xmx3072m -Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -XX:+DisableExplicitGC -Xverify:none -Djava.awt.headless=true</cargo.jvmargs>
</properties>
</configuration>
Expand Down
Loading