Skip to content
Snippets Groups Projects
Verified Commit c2fc19e9 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-grpc-main' into f-grpc-dev

parents e7343f48 0668a8d0
Branches
Tags
2 merge requests!44Release 0.6,!43Merge f-GRPC-main to dev
Pipeline #15449 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
...@@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -9,6 +9,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security
## [v0.5.0] - 2021-10-19
### Added
* An openAPI specification of the XML api * An openAPI specification of the XML api
* New server configuration option `SERVER_BIND_ADDRESS`, which is the address to listen to. See [server.conf](conf/core/server.conf). * New server configuration option `SERVER_BIND_ADDRESS`, which is the address to listen to. See [server.conf](conf/core/server.conf).
......
* caosdb-mysqlbackend == 4.1.0 * caosdb-mysqlbackend == 5.0.0
* Java 11 * Java 11
* Apache Maven >= 3.6.0 * Apache Maven >= 3.6.0
* make >= 4.2.0 * make >= 4.2.0
- easy-units >= 0.0.1 https://gitlab.com/timm.fitschen/easy-units * More dependencies are being pulled and installed automatically by Maven. See the complete list of dependencies in the [pom.xml](pom.xml)
...@@ -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:
......
caosdb-webui @ 8e5799db
Subproject commit c2dc8e9e9e0517ee7fb0d280717211a015906f64 Subproject commit 8e5799db53b853b06a51a3bd250daeb9c779eee5
...@@ -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.
...@@ -166,7 +169,8 @@ ADMIN_EMAIL= ...@@ -166,7 +169,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.
...@@ -174,6 +178,7 @@ CACHE_DISABLE=false ...@@ -174,6 +178,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.
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.caosdb</groupId> <groupId>org.caosdb</groupId>
<artifactId>caosdb-server</artifactId> <artifactId>caosdb-server</artifactId>
<version>0.5.0-GRPC0.0.20</version> <version>0.5.1-GRPC0.0.20</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>CaosDB Server</name> <name>CaosDB Server</name>
<scm> <scm>
......
...@@ -27,7 +27,7 @@ author = 'Daniel Hornung' ...@@ -27,7 +27,7 @@ author = 'Daniel Hornung'
# The short X.Y version # The short X.Y version
version = '0.5' version = '0.5'
# The full version, including alpha/beta/rc tags # The full version, including alpha/beta/rc tags
release = '0.5.0-SNAPSHOT' release = '0.5.1-SNAPSHOT'
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment