From 7e5ef30219e420fc784629574ebe9ae9795a5ea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Wed, 27 Oct 2021 17:45:41 +0200
Subject: [PATCH] MAINT: disable transaction benchmark; docs

---
 .gitignore            | 4 ++++
 README_SETUP.md       | 5 +++++
 conf/core/server.conf | 7 ++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2b4a6253..c6fdfc4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,7 @@ __pycache__
 
 # Documentation binaries
 src/doc/development/api/xml/*.jar
+
+
+# data directories
+CaosDBFileSystem
diff --git a/README_SETUP.md b/README_SETUP.md
index 95805257..d738ad13 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -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`
   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.
+- 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 ####
 If `make` fails with `pam_authentication.c:4:31: fatal error:
diff --git a/conf/core/server.conf b/conf/core/server.conf
index 793f8111..ac6efe97 100644
--- a/conf/core/server.conf
+++ b/conf/core/server.conf
@@ -53,6 +53,7 @@ USER_SOURCES_INI_FILE=./conf/ext/usersources.ini
 NEW_USER_DEFAULT_ACTIVITY=INACTIVE
 # If set to true, unauthenticated access to the database is possible with an anonymous user.
 AUTH_OPTIONAL=FALSE
+#AUTH_OPTIONAL=TRUE
 
 # --------------------------------------------------
 # MySQL settings
@@ -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
 # hostname and port. Must start with "/".
 CONTEXT_ROOT=
+#CONTEXT_ROOT=/caosdb
+
 # 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
 # localhost only.
@@ -161,7 +164,8 @@ ADMIN_EMAIL=
 BUGTRACKER_URI=
 
 # 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.
 CACHE_CONF_LOC=./conf/core/cache.ccf
 # Set this option to true to lobally disable caching. Used for debugging.
@@ -169,6 +173,7 @@ CACHE_DISABLE=false
 
 # 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=/data/caosdb,/fileserver01/caosdb
 
 # Sudo password of the system.
 # Needed by the drop off box to set file permissions.
-- 
GitLab