diff --git a/net/radicale3/files/radicale3.config b/net/radicale3/files/radicale3.config index 5107219df0..753044cf02 100644 --- a/net/radicale3/files/radicale3.config +++ b/net/radicale3/files/radicale3.config @@ -1,4 +1,4 @@ -#config section server +config section server # list host 127.0.0.1:5232 # list host ::1:5232 diff --git a/net/radicale3/files/radicale3.init b/net/radicale3/files/radicale3.init index eb78f8bf9d..9a4c093205 100755 --- a/net/radicale3/files/radicale3.init +++ b/net/radicale3/files/radicale3.init @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common # shellcheck shell=ash # cspell:words CFGDIR SYSCFG USRCFG cfgfile chgrp defval getline hostlist -# cspell:words htpasswd radicale tmpconf tmpusers +# cspell:words htpasswd radicale tmpconf tmpusers multifilesystem # shellcheck disable=SC2034 START=99 @@ -11,7 +11,7 @@ PROG=/usr/bin/radicale3 CFGDIR=/var/etc/radicale3 SYSCFG=$CFGDIR/config USRCFG=$CFGDIR/users -DATADIR="/srv/radicale3/data" +DATADIR="/var/radicale3/data" conf_line() { local cfgfile="$1" @@ -77,9 +77,6 @@ conf_section() { conf_getline "$cfg" "$cfgfile" protocol conf_getline "$cfg" "$cfgfile" ciphers fi - - conf_getline "$cfg" "$cfgfile" dns_lookup 1 1 - conf_getline "$cfg" "$cfgfile" realm ;; encoding) conf_getline "$cfg" "$cfgfile" request @@ -92,6 +89,7 @@ conf_section() { conf_getline "$cfg" "$cfgfile" htpasswd_encryption plain fi + conf_getline "$cfg" "$cfgfile" realm conf_getline "$cfg" "$cfgfile" delay ;; rights) @@ -106,18 +104,16 @@ conf_section() { if [ -n "$value" ]; then DATADIR="$value" fi - conf_getline "$cfg" "$cfgfile" filesystem_locking 1 1 + conf_getline "$cfg" "$cfgfile" type conf_getline "$cfg" "$cfgfile" max_sync_token_age - conf_getline "$cfg" "$cfgfile" filesystem_close_lock_file 0 1 conf_getline "$cfg" "$cfgfile" hook ;; web) conf_getline "$cfg" "$cfgfile" "type" ;; logging) - conf_getline "$cfg" "$cfgfile" config - conf_getline "$cfg" "$cfgfile" debug 0 1 - conf_getline "$cfg" "$cfgfile" full_environment 0 1 + conf_getline "$cfg" "$cfgfile" level info 0 + conf_getline "$cfg" "$cfgfile" trace_on_debug 0 1 conf_getline "$cfg" "$cfgfile" mask_passwords 1 1 ;; headers)