Commit 931a7780 authored by Guillaume Mella's avatar Guillaume Mella

move conf files in etc directory (see prepare_etc_conf.sh)

parent 54469c73
......@@ -42,7 +42,7 @@ RUN sed -i -e '/^assistive_technologies=/s/^/#/' /etc/java-*-openjdk/accessibili
RUN $MVN install &&\
ant
FROM existdb/existdb:5.0.0
FROM existdb/existdb:5.2.0
COPY --from=builder /tmp/exist/build/*.jar $EXIST_HOME/lib/user/
......@@ -52,11 +52,8 @@ COPY --from=builder /tmp/exist/build/jmmc-realm-*.xar /tmp/exist/build/jmmc-reso
COPY --from=builder /tmp/exist/build/oidb-data*.xar $EXIST_HOME/autodeploy/
COPY --from=builder /tmp/exist/build/oidb-[0-9]*.*.xar $EXIST_HOME/autodeploy/zz_oidb.xar
COPY conf.xml $EXIST_HOME/etc/conf.xml
COPY controller-config.xml $EXIST_HOME/etc/webapp/WEB-INF/controller-config.xml
COPY web.xml $EXIST_HOME/etc/webapp/WEB-INF/web.xml
COPY jetty.xml $EXIST_HOME/etc/jetty/jetty.xml
#COPY log4j2.xml $EXIST_HOME/config/log4j2.xml
# Copy config files ( look at prepare_etc_conf.sh script )
COPY etc $EXIST_HOME/etc
# for workarround ... https://github.com/eXist-db/documentation/issues/385#issuecomment-537105064
COPY --from=builder /tmp/exist/jmmc-resources*/content/*.jar $EXIST_HOME/lib/user/
......
......@@ -12,8 +12,8 @@
startup
triggers
pool
query-pool
recovery
security
watchdog
lock-manager
repository
......@@ -123,27 +123,55 @@
with high load will never be shrinked. A negative value means that
shrinkage will not be performed.
- doc-ids:
how document ids are managed by eXist. Takes the values
"default" or "incremental".
eXist assigns a unique, 32bit integer document id to every
document. When a document is deleted, its id will be freed
and reused for the next document stored. The disadvantage
of this approach is that document ids
are not stable, i.e. one cannot be sure that the same document
id will always identify the same document.
If you need stable, incremental ids, set the option doc-ids to
"incremental".
- minDiskSpace:
The amount of disk space (in megabytes) which should be available for
the database to continue operations. If free disk space goes below
the configured limit, eXist-db will flush all buffers to disk and
switch to read-only mode in order to prevent potential data loss.
Set the limit large enough to allow all pending operations to
complete. The default is 1 gigabyte.
complete. Set to -1 to disable. The default is 1 gigabyte.
- posix-chown-restricted:
As defined by POSIX.1 for _POSIX_CHOWN_RESTRICTED.
When posix-chown-restricted="true" (the default) then:
1. Only a superuser process can change the user ID of the file.
2. A non-superuser process can change the group ID of the file
if the process owns the file (the effective user ID equals
the user ID of the file), and group equals either the
effective group ID of the process or one of the
process’s supplementary group IDs.
This means that when posix-chown-restricted="true", you can’t change
the user ID of your files. You can change the group ID of files that
you own, but only to groups that you belong to.
When posix-chown-restricted="false" you can change the user ID of
any file that you own, effectively "giving away the file" to
another user. Such a setting has negative security implications,
further details can be seen in the "Rationale" section for the
chown function in the POSIX.1-2017 (Issue 7, 2018 edition) standard.
See: http://pubs.opengroup.org/onlinepubs/9699919799/functions/chown.html#tag_16_59_07
- preserve-on-copy
When copying Collections and Documents within the database, the
default (`false`), is not to preserve their attributes
(modification time, mode, user-id, group-id, and ACL).
NOTE: Not preserving attributes, is inline with both the GNU and
BSD `cp` commands, and therefore expected behaviour; The target
Collection or Document is created following the rules of the
target parent, and the effective user and their umask.
Setting preserve-on-copy="true" changes the default behaviour
so that the target Collection or Document of a copy, has the same
attributes as the source.
The preserve-on-copy setting can be overridden on a case-by-case
basis by setting the `preserve` flag to either `true` or `false`
when calling xmldb:copy(), or via any other API that supports copy.
Omitting the preserve flag when calling a copy operation, implies
the behaviour that is set in this configuration.
=====================================================================
The settings below are very conservative to avoid out-of-memory
......@@ -155,7 +183,7 @@
-->
<db-connection cacheSize="256M" checkMaxCacheSize="true" collectionCache="64M" database="native"
files="../data" pageSize="4096" nodesBuffer="1000" cacheShrinkThreshold="10000"
doc-ids="default" minDiskSpace="128M">
minDiskSpace="1024M" posix-chown-restricted="true" preserve-on-copy="false">
<!--
Startup Triggers are executed before the database becomes generally available
......@@ -369,10 +397,26 @@
This can also be set via the Java System Properties `org.exist.lock-manager.warn-wait-on-read-for-write`,
or (legacy) `exist.lockmanager.warn.waitonreadforwrite`.
- paths-multi-writer
Set to true to enable Multi-Writer/Multi-Reader semantics for
the database Collection/Document Hierarchy as opposed to the default (false)
for Single-Writer/Multi-Reader.
NOTE: Whilst enabling Multiple-Writers on the Collection and Document Hierarchy can improve concurrent
through-put for write-heavy workloads, it can also can lead to deadlocks unless the User's
Collection Hierarchy is carefully designed to isolate query/database writes between Collection combs.
It is highly recommended that users leave this as the default setting. For more information, see:
"Locking and Cache Improvements for eXist-db", 2018-02-05, Section "Attempt 6" Page 58 -
https://www.evolvedbinary.com/technical-reports/exist-db/locking-and-cache-improvements/
This can also be set via the Java System Properties `org.exist.lock-manager.paths-multiple-writers`,
or (legacy) `exist.lockmanager.paths-multiwriter`.
-->
<lock-manager
upgrade-check="false"
warn-wait-on-read-for-write="false">
warn-wait-on-read-for-write="false"
paths-multi-writer="false">
<!--
Settings for the Lock Table
......@@ -400,39 +444,20 @@
<lock-table disabled="false" trace-stack-depth="0"/>
<!--
Settings for Collection Locking
- multiple-writers
Set to true to enable Multi-Writer/Multi-Reader semantics for
the Collection Hierarchy as opposed to the default (false) for Single-Writer/Multi-Reader.
NOTE: Whilst enabling Multiple-Writers on the Collection Hierarchy can improve concurrent
through-put for write-heavy workloads, it can also can lead to deadlocks unless the User's
Collection Hierarchy is carefully designed to isolate query/database writes between Collection combs.
It is highly recommended that users leave this as the default setting. For more information, see:
"Locking and Cache Improvements for eXist-db", 2018-02-05, Section "Attempt 6" Page 58 -
https://www.evolvedbinary.com/technical-reports/exist-db/locking-and-cache-improvements/
This can also be set via the Java System Properties `org.exist.lock-manager.collection.multiple-writers`,
or (legacy) `exist.lockmanager.collections.multiwriter`.
-->
<collection multiple-writers="false"/>
<!-- Settings for Document Locking
- multi-lock
Set to true to use the "Fast Multi-Level locks" implementation
(uk.ac.ic.doc.slurp.multilock.MultiLock) for locking documents, instead of the default of Java's
Reentrant Read Write Lock implementation (java.util.concurrent.locks.ReentrantReadWriteLock).
- use-path-locks
Set to true to have documents participate in the same hierarchical
path based locking strategy as Collections.
This has a performance and concurrency impact, but will ensure
that you cannot have deadlocks between Collections and Documents.
NOTE: At present changing this option has little effect.
NOTE: in future this will likely be set to `true` by default.
This can also be set via the Java System Properties `org.exist.lock-manager.document.multi-lock`,
or (legacy) `exist.lockmanager.documents.multilock`.
This can also be set via the Java System Property `org.exist.lock-manager.document.use-path-locks`.
-->
<document multi-lock="false"/>
<document use-path-locks="false"/>
</lock-manager>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment