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

diff --git a/radicale-setup b/radicale-setup
index cb27eda..aed914b 100755
--- a/radicale-setup
+++ b/radicale-setup
@@ -18,21 +18,27 @@
 # 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
 EOF
+ser daemon-reload # not sure this is needed
 
-pi radicale
+pi-nostart radicale
 
 # I moved /var/lib/radicale after it's initialization.
 # I did a sudo -u radicale git init in the collections subfolder