radicale3: updates due to radicale 3 vs 2 changes

* Various options have changed since radicale2, and the current
  initscripts set configuration that prevents radicale3 from starting
  in some cases. So update the options to radicale3.
* LuCI will not display the app when the config file is empty, so
  uncomment the first (server section) line.
* Changed the default data directory to /var (emphemeral storage) as
  OpenWrt policy is to not write flash by default. As with PostgreSQL,
  to be useful the user will need to set configuration for an
  appropriate path.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>

diff --git a/net/radicale3/files/radicale3.config b/net/radicale3/files/radicale3.config
index 5107219df0f044c78309d67106c81fcfe5b5c9ce..753044cf02362f82a8494cdff7966f2ba549ac67 100644 (file)
--- 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 eb78f8bf9dd0dc6822c75d85361f05a6d38a5d73..9a4c09320530a5ec4d97871a5e5c0dd17d077a52 100755 (executable)
--- 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)