iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor improvements
[distro-setup]
/
radicale-setup
diff --git
a/radicale-setup
b/radicale-setup
index cb27eda4ec1d93165c50723d72d10f59a7938fea..aed914b1c3eb2f635891ef0a6e616c8db4d3a5db 100755
(executable)
--- a/
radicale-setup
+++ b/
radicale-setup
@@
-18,21
+18,27
@@
# created password file with:
# htpasswd -c /etc/davpass dav
# 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
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
[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
[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
# I moved /var/lib/radicale after it's initialization.
# I did a sudo -u radicale git init in the collections subfolder