X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=radicale-setup;h=ba8fde2321caee3450edb466d0236f1d2e585075;hb=e256742f75e1127266e4ce1e2a871a81a72bc84a;hp=cb27eda4ec1d93165c50723d72d10f59a7938fea;hpb=ebd0ea323de3eacc11e1a624f8cc4f961d8bdb6c;p=distro-setup

diff --git a/radicale-setup b/radicale-setup
index cb27eda..ba8fde2 100755
--- a/radicale-setup
+++ b/radicale-setup
@@ -1,5 +1,5 @@
 #!/bin/bash -l
-
+set -x
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
 
@@ -18,21 +18,40 @@
 # 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'
+sudo dd of=$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
+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 {} +
 
-pi radicale
 
 # I moved /var/lib/radicale after it's initialization.
 # I did a sudo -u radicale git init in the collections subfolder
@@ -64,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:
 #