minor bug fix

[distro-setup] / radicale-setup

diff --git a/radicale-setup b/radicale-setup
index cb27eda4ec1d93165c50723d72d10f59a7938fea..1d0ca163ca6b80e3cf62f131673021bd14a8daad 100755 (executable)
--- a/radicale-setup
+++ b/radicale-setup
@@ -1,8 +1,16 @@
-#!/bin/bash -l
+#!/bin/bash
 
-[[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 
+if [[ -e /b/errhandle/err ]]; then
+  source /b/errhandle/err
+else
+  set -eE -o pipefail
+  trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+fi
 
+source /a/bin/bash_unpublished/source-state
+source /a/bin/distro-functions/src/package-manager-abstractions
 # davdroid setup instructions at the bottom
 
 # main docs:
@@ -18,26 +26,47 @@
 # created password file with:
 # htpasswd -c /etc/davpass dav
 
+vpn_ser=openvpn-client
+if [[ ! -e /lib/systemd/system/openvpn-client@.service ]]; then
+    vpn_ser=openvpn
+fi
+
 d=/etc/systemd/system/radicale.service.d
 mkdir -p $d
-sudo dd of=$d/override.conf <<'EOF'
+cat >$d/override.conf <<EOF
 [Unit]
 # this unit is configured to start and stop whenever openvpn-client@mail.service
 # does
 After=network.target
-BindsTo=openvpn-client@mail.service
-After=openvpn-client@mail.service
+BindsTo=$vpn_ser@mail.service
+After=$vpn_ser@mail.service
 
 [Install]
-RequiredBy=openvpn-client@mail.service
+RequiredBy=$vpn_ser@mail.service
 EOF
+systemctl daemon-reload # not sure this is needed
+
+pi-nostart radicale
+
+# use persistent uid/gid
+IFS=:; read -r _ _ uid _ < <(getent passwd radicale ); unset IFS
+IFS=:; read -r _ _ gid _ < <(getent group radicale ); unset IFS
+if [[ $uid != 609 ]]; then
+    systemctl stop radicale ||:
+    usermod -u 609 radicale
+    groupmod -g 609 radicale
+    usermod -g 609 radicale
+fi
+log_p=/var/log/radicale
+[[ -d $log_p ]] || log_p=
+find /o/radicale  -xdev -exec chown -h 609 {} +
+find /o/radicale -xdev -exec chgrp -h 609 {} +
 
-pi radicale
 
 # I moved /var/lib/radicale after it's initialization.
 # I did a sudo -u radicale git init in the collections subfolder
 # after it gets created, per the git docs.
-lnf -T /o/radicale /var/lib/radicale
+/a/exe/lnf -T /o/radicale /var/lib/radicale
 
 # from https://www.williamjbowman.com/blog/2015/07/24/setting-up-webdav-caldav-and-carddav-servers/
 
@@ -56,7 +85,8 @@ setini() {
 setini hosts 10.8.0.4:5232 server
 
 if [[ $HOSTNAME == $MAIL_HOST ]]; then
-    sgo radicale
+    systemctl start radicale
+    systemctl enable radicale
 fi
 
 # disable power management feature, set to 240 min sync interval,
@@ -64,10 +94,9 @@ fi
 
 # davdroid from f-druid.
 # login with url and user name
-# username ian,
-# url https://cal.iankelling.org
+# url https://cal.iankelling.org/ian
 # username ian
-# pass, see password manager
+# pass, see password manager for radicale
 #
 # add account dialog:
 #