X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=radicale-setup;h=ba8fde2321caee3450edb466d0236f1d2e585075;hb=77f3e699ab79d597d22fc052ed03d25cf0ad02da;hp=826ddb92f91b9940afad82a72f914318868477c7;hpb=a84e2166aafd58213298ff4b2f674a4b644cc416;p=distro-setup

diff --git a/radicale-setup b/radicale-setup
index 826ddb9..ba8fde2 100755
--- a/radicale-setup
+++ b/radicale-setup
@@ -1,42 +1,69 @@
 #!/bin/bash -l
-
+set -x
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
+
 # davdroid setup instructions at the bottom
 
 # main docs:
 # http://radicale.org/user_documentation/
 # https://davdroid.bitfire.at/configuration/
 
+# note on debugging: if radicale can't bind to the address,
+# in the log it just says "Starting Radicale". If you run
+# it in the foreground, it will give more info. Background
+# plus debug does not help.
+# sudo -u radicale radicale -D -f
 
 # created password file with:
-# htpasswd -c /etc/nginx/caldav/htpasswd ian
+# 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
+[Unit]
+# this unit is configured to start and stop whenever openvpn-client@mail.service
+# does
+After=network.target
+BindsTo=$vpn_ser@mail.service
+After=$vpn_ser@mail.service
+
+[Install]
+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 {} +
 
-# python-dulwich, to track changes with git, per
-# http://radicale.org/user_documentation/#idgit-support
-pi nginx python-dulwich 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
 
-acme-tiny -n cal.iank.pw
-
 # from https://www.williamjbowman.com/blog/2015/07/24/setting-up-webdav-caldav-and-carddav-servers/
-mkdir /etc/nginx/caldav
-touch /etc/nginx/caldav/htpasswd
-chmod 640 /etc/nginx/caldav/htpasswd
-chgrp www-data /etc/nginx/caldav/htpasswd
-nginx-site -f 5232 - cal.iank.pw <<'EOF'
-    auth_basic "Not currently available";
-    auth_basic_user_file /etc/nginx/caldav/htpasswd;
-EOF
+
+# more config is for li in distro-end
 
 # coment in this file says this is needed for it to run on startup
 sed -ri 's/^\s*#+\s*(ENABLE_RADICALE\s*=\s*yes\s*)/\1/' /etc/default/radicale
-sgo radicale
 
 setini() {
     key="$1" value="$2" section="$3"
@@ -45,27 +72,44 @@ setini() {
 }
 
 # comments say default is 0.0.0.0:5232
-setini hosts 127.0.0.1:5232 server
+setini hosts 10.8.0.4:5232 server
+
+if [[ $HOSTNAME == $MAIL_HOST ]]; then
+    sgo radicale
+fi
 
-# davdroid from f-droid. username ian,
-# url https://iank.pw/radicale/ian.
-# I disabled power management feature, it's got 240 min sync interval,
+# disable power management feature, set to 240 min sync interval,
 # so it shouldn't be bad.
-#
 
-# when setting up davdroid, switch to groups are per-contact categories,
-# per https://davdroid.bitfire.at/configuration/radicale/
+# davdroid from f-druid.
+# login with url and user name
+# url https://cal.iankelling.org/ian
+# username ian
+# pass, see password manager for radicale
+#
+# add account dialog:
 #
 # set account name as ian@iankelling.org, per help text below the
 # field.
 #
+# switch to groups are per-contact categories,
+# per https://davdroid.bitfire.at/configuration/radicale/
+#
+#
 # After setting up account, I added one address book, named
-# ian. calender was already created, named ian. checked boxes under
+# ianaddr. calender was already created, named ian. checked boxes under
 # both. synced.
 #
+# To restore from old phone to new phone, I wiped all data out, then copied over the newly created files. I think
+#
 # ignorable background info:
 #
-# When debugging, tailed /var/log/radicale/radicale.log and nginx log,
+# opentasks uses the calendar file.
+#
+# The address book I created got a uuid as a name for the file. Note
+# the .props file says if it's a calendar or addressbook.
+#
+# When debugging, tailed /var/log/radicale/radicale.log and apache log,
 # both show the requests happening. Without creating the address book,
 # after creating a contact, a sync would delete it.
 #
@@ -80,3 +124,6 @@ setini hosts 127.0.0.1:5232 server
 # https://davdroid.bitfire.at/faq/entry/cant-manage-groups-on-device/
 #
 # Note, url above says only cayanogenmod 13+ and omnirom can manage groups.
+
+# Note, radicale had built-in git support to track changes, but they
+# removed it in 2.0.