lots of fixes

[distro-setup] / radicale-setup

diff --git a/radicale-setup b/radicale-setup
index aed914b1c3eb2f635891ef0a6e616c8db4d3a5db..ba8fde2321caee3450edb466d0236f1d2e585075 100755 (executable)
--- a/radicale-setup
+++ b/radicale-setup
@@ -1,5 +1,5 @@
 #!/bin/bash -l
-
+set -x
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
 
@@ -34,12 +34,25 @@ BindsTo=$vpn_ser@mail.service
 After=$vpn_ser@mail.service
 
 [Install]
-RequiredBy=openvpn-client@mail.service
+RequiredBy=$vpn_ser@mail.service
 EOF
 ser daemon-reload # not sure this is needed
 
 pi-nostart radicale
 
+# use persistent uid/gid
+IFS=:; read _ _ uid _ < <(getent passwd radicale ); unset IFS
+IFS=:; read _ _ 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
+find /o/radicale /var/log/radicale -xdev -exec chown -h 609 {} +
+find /o/radicale -xdev -exec chgrp -h 609 {} +
+
+
 # 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.
@@ -70,10 +83,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:
 #