Skip to content
Snippets Groups Projects
Commit 7e5ef302 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

MAINT: disable transaction benchmark; docs

parent d1507038
No related branches found
No related tags found
2 merge requests!41REL: update changelog, bump version of pom.xml, update DEPENDENCIES,!40F doc pam
Pipeline #15254 passed
...@@ -44,3 +44,7 @@ __pycache__ ...@@ -44,3 +44,7 @@ __pycache__
# Documentation binaries # Documentation binaries
src/doc/development/api/xml/*.jar src/doc/development/api/xml/*.jar
# data directories
CaosDBFileSystem
...@@ -59,6 +59,11 @@ installed and the pam user tool must be compiled: ...@@ -59,6 +59,11 @@ installed and the pam user tool must be compiled:
- If you want, you can run a test now: `./pam_authentication.sh asdf ghjk` - If you want, you can run a test now: `./pam_authentication.sh asdf ghjk`
should print `[FAILED]` and return with a non-zero exit code. Unless there is should print `[FAILED]` and return with a non-zero exit code. Unless there is
a user `asdf` with password `ghjk` on your system, of course. a user `asdf` with password `ghjk` on your system, of course.
- If you want to run the CaosDB server without root privilege, you need to use
the setuid bit for the binary. For example, if the user `caosdb` runs the
server process the permissions of `bin/pam_authentication` should be the
following:
`-rwsr-x--- 1 root caosdb pam_authentication`
##### Troubleshooting #### ##### Troubleshooting ####
If `make` fails with `pam_authentication.c:4:31: fatal error: If `make` fails with `pam_authentication.c:4:31: fatal error:
......
...@@ -53,6 +53,7 @@ USER_SOURCES_INI_FILE=./conf/ext/usersources.ini ...@@ -53,6 +53,7 @@ USER_SOURCES_INI_FILE=./conf/ext/usersources.ini
NEW_USER_DEFAULT_ACTIVITY=INACTIVE NEW_USER_DEFAULT_ACTIVITY=INACTIVE
# If set to true, unauthenticated access to the database is possible with an anonymous user. # If set to true, unauthenticated access to the database is possible with an anonymous user.
AUTH_OPTIONAL=FALSE AUTH_OPTIONAL=FALSE
#AUTH_OPTIONAL=TRUE
# -------------------------------------------------- # --------------------------------------------------
# MySQL settings # MySQL settings
...@@ -77,6 +78,8 @@ MYSQL_SCHEMA_VERSION=v5.0 ...@@ -77,6 +78,8 @@ MYSQL_SCHEMA_VERSION=v5.0
# The context root is a prefix which allows running multiple instances of CaosDB using the same # The context root is a prefix which allows running multiple instances of CaosDB using the same
# hostname and port. Must start with "/". # hostname and port. Must start with "/".
CONTEXT_ROOT= CONTEXT_ROOT=
#CONTEXT_ROOT=/caosdb
# Server bind/host address, which is the address to listen to. Set to blank, or # Server bind/host address, which is the address to listen to. Set to blank, or
# 0.0.0.0 in IPv4, to listen to all. Set to 127.0.0.1 to make it available to # 0.0.0.0 in IPv4, to listen to all. Set to 127.0.0.1 to make it available to
# localhost only. # localhost only.
...@@ -161,7 +164,8 @@ ADMIN_EMAIL= ...@@ -161,7 +164,8 @@ ADMIN_EMAIL=
BUGTRACKER_URI= BUGTRACKER_URI=
# If set to true MySQL stores transaction benchmarks for all SQL queries. Used for benchmarking and debugging. # If set to true MySQL stores transaction benchmarks for all SQL queries. Used for benchmarking and debugging.
TRANSACTION_BENCHMARK_ENABLED=true TRANSACTION_BENCHMARK_ENABLED=FALSE
#TRANSACTION_BENCHMARK_ENABLED=TRUE
# Location of the configuration file for the CaosDB cache. # Location of the configuration file for the CaosDB cache.
CACHE_CONF_LOC=./conf/core/cache.ccf CACHE_CONF_LOC=./conf/core/cache.ccf
# Set this option to true to lobally disable caching. Used for debugging. # Set this option to true to lobally disable caching. Used for debugging.
...@@ -169,6 +173,7 @@ CACHE_DISABLE=false ...@@ -169,6 +173,7 @@ CACHE_DISABLE=false
# The server is allowed to create symlinks to files and folders within this whitelist of directories. # The server is allowed to create symlinks to files and folders within this whitelist of directories.
INSERT_FILES_IN_DIR_ALLOWED_DIRS= INSERT_FILES_IN_DIR_ALLOWED_DIRS=
#INSERT_FILES_IN_DIR_ALLOWED_DIRS=/data/caosdb,/fileserver01/caosdb
# Sudo password of the system. # Sudo password of the system.
# Needed by the drop off box to set file permissions. # Needed by the drop off box to set file permissions.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment