X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;ds=sidebyside;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=bada49b955c6c5cc8aef78aa270c3128579e8a82;hb=47009246a78487eb3fbd708141cdbf101e1d5e4a;hp=c610395dbad70bb59db1637f980415fa1e373225;hpb=e7793f1b7978fa302c4da4c4943d849f7917b944;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index c610395..bada49b 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -4,45 +4,65 @@
 # Run `vdirsyncer --help` for CLI usage.
 #
 # Optional parameters are commented out.
-# This file doesn't document all available parameters, see
+# This file doesn"t document all available parameters, see
 # http://vdirsyncer.readthedocs.org/ for the rest of them.
 
 [general]
 # A folder where vdirsyncer can store some metadata about each pair.
-status_path = ~/.vdirsyncer/status/
-password_command = pass show caldav_ygdrassil/mart
+status_path = "~/.vdirsyncer/status/"
+#default_command = "sync"
 
 # CARDDAV
 [pair contacts]
-a = contacts_local
-b = contacts_remote
-
+a = "contacts_local"
+b = "contacts_remote"
 collections = ["from b"]
 
 [storage contacts_local]
-type = filesystem
-path = ~/.vdirsyncer/card
-fileext = .vcf
+type = "filesystem"
+path = "~/.vdirsyncer/card"
+fileext = ".vcf"
 
 [storage contacts_remote]
-type = carddav
-url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
-auth = digest
-username = mart
+type = "carddav"
+url = "https://cal.martlubbers.net/dav.php/addressbooks"
+#auth = "digest"
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
 # CALDAV
 [pair calendar]
-a = calendar_local
-b = calendar_remote
-collections = ["default", "mart", "elvira", "vuilnis"]
+a = "calendar_local"
+b = "calendar_remote"
+collections = ["from b"]
 
 [storage calendar_local]
-type = filesystem
-path = ~/.vdirsyncer/cal
-fileext = .ics
+type = "filesystem"
+path = "~/.vdirsyncer/cal"
+fileext = ".ics"
 
 [storage calendar_remote]
-type = caldav
-url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
-auth = digest
-username = mart
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars"
+#auth = digest
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+# Tasks
+[pair tasks]
+a = "tasks_local"
+b = "tasks_remote"
+conflict_resolution = "a wins"
+collections = ["from b"]
+
+[storage tasks_local]
+type = "filesystem"
+path = "~/.vdirsyncer/tasks"
+fileext = ".ics"
+
+[storage tasks_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars"
+#auth = digest
+username = "task"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]