Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-server
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-server
Commits
687c0137
Verified
Commit
687c0137
authored
Aug 5, 2021
by
Timm Fitschen
Browse files
Options
Downloads
Patches
Plain Diff
REVIEW: fixes some minor referencing issues
parent
dce9dafc
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!41
REL: update changelog, bump version of pom.xml, update DEPENDENCIES
,
!25
DOC: merge README_CONFIGURATION.md and configuration.rst
Pipeline
#11495
passed
Aug 5, 2021
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/doc/administration/configuration.rst
+9
-5
9 additions, 5 deletions
src/doc/administration/configuration.rst
src/doc/roles.md
+2
-2
2 additions, 2 deletions
src/doc/roles.md
with
11 additions
and
7 deletions
src/doc/administration/configuration.rst
+
9
−
5
View file @
687c0137
# Server Configuration
Server Configuration
====================
## Main Configuration File
Main Configuration File
-----------------------
The server is configured through configuration files. The main file is the
The server is configured through configuration files. The main file is the
`server.conf`.
`server.conf`.
...
@@ -29,12 +31,13 @@ The default configuration can be overriden by
...
@@ -29,12 +31,13 @@ The default configuration can be overriden by
in this order.
in this order.
## Further Configuration Files
Further Configuration Files
---------------------------
Further settings are to be set in files which are by default stored in `./conf/core/`:
Further settings are to be set in files which are by default stored in `./conf/core/`:
``global_entity_permissions.xml``
``global_entity_permissions.xml``
:doc:`Permissions<../
P
ermissions>` which are automatically set, based on user roles. See the
:doc:`Permissions<../
p
ermissions>` which are automatically set, based on user roles. See the
`default file
`default file
<https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/dev/conf/core/global_entity_permissions.xml>`__.
<https://gitlab.indiscale.com/caosdb/src/caosdb-server/-/blob/dev/conf/core/global_entity_permissions.xml>`__.
...
@@ -71,7 +74,8 @@ The administrator may set the corresponding options in the main configuration
...
@@ -71,7 +74,8 @@ The administrator may set the corresponding options in the main configuration
file (`./conf/core/server.conf` and it's friends) to replace these special
file (`./conf/core/server.conf` and it's friends) to replace these special
files with custom configuration.
files with custom configuration.
## Changing the configuration at runtime
Changing the configuration at runtime
-------------------------------------
Remark:
Remark:
Only when the server is in debug mode, the general configuration can be changed at runtime.
Only when the server is in debug mode, the general configuration can be changed at runtime.
...
...
This diff is collapsed.
Click to expand it.
src/doc/roles.md
+
2
−
2
View file @
687c0137
...
@@ -10,7 +10,7 @@ users may have the same role, and there may be roles without any users.
...
@@ -10,7 +10,7 @@ users may have the same role, and there may be roles without any users.
The user and their roles are always returned by the server in answers to requests
The user and their roles are always returned by the server in answers to requests
and can thus be interpreted and used by clients. The most important use though
and can thus be interpreted and used by clients. The most important use though
is
[
permission
](
P
ermissions
)
checking in the server: Access and
is
[
permission
](
doc:`p
ermissions
`
)
checking in the server: Access and
modification of
modification of
entities can be controlled via roles, so that users of a given role are allowed
entities can be controlled via roles, so that users of a given role are allowed
or denied certain actions. Incidentally, the permission to edit the permissions
or denied certain actions. Incidentally, the permission to edit the permissions
...
@@ -32,4 +32,4 @@ There are some special roles, which are automatically assigned to users:
...
@@ -32,4 +32,4 @@ There are some special roles, which are automatically assigned to users:
Except for the
`anonymous`
role, these special roles are not returned by the
Except for the
`anonymous`
role, these special roles are not returned by the
server, but can nevertheless be used to define
server, but can nevertheless be used to define
[
permissions
](
P
ermissions
)
.
[
permissions
](
doc:`p
ermissions
`
)
.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment