X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=dd94fc2cac2dcb07267c2ca836aa8c39d4c9a61f;hb=bc7c93382c7b03165d472d205ec1261f876a8db5;hp=aaf932660d9d54f5880c2d569455723388221550;hpb=39341226752423f724aee2520f93c46d5780c98a;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index aaf9326..dd94fc2 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -9,7 +9,7 @@
 
 [general]
 # A folder where vdirsyncer can store some metadata about each pair.
-status_path = "~/.vdirsyncer/status/"
+status_path = "~/.local/share/vdirsyncer/status/"
 #default_command = "sync"
 
 # CARDDAV
@@ -17,16 +17,17 @@ status_path = "~/.vdirsyncer/status/"
 a = "contacts_local"
 b = "contacts_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage contacts_local]
 type = "filesystem"
-path = "~/.vdirsyncer/card"
+path = "~/.local/share/vdirsyncer/card"
 fileext = ".vcf"
 
 [storage contacts_remote]
 type = "carddav"
-url = "https://cal.martlubbers.net/caldav.php/mart"
-#auth = digest
+url = "https://cal.martlubbers.net/dav.php/addressbooks"
+#auth = "digest"
 username = "mart"
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
@@ -35,19 +36,20 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 a = "calendar_local"
 b = "calendar_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage calendar_local]
 type = "filesystem"
-path = "~/.vdirsyncer/cal"
+path = "~/.local/share/vdirsyncer/cal"
 fileext = ".ics"
 
 [storage calendar_remote]
 type = "caldav"
-url = "https://cal.martlubbers.net/caldav.php/mart"
+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"
@@ -57,27 +59,12 @@ collections = ["from b"]
 
 [storage tasks_local]
 type = "filesystem"
-path = "~/.vdirsyncer/tasks"
+path = "~/.local/share/vdirsyncer/tasks"
 fileext = ".ics"
 
 [storage tasks_remote]
 type = "caldav"
-url = "https://cal.martlubbers.net/caldav.php/task"
+url = "https://cal.martlubbers.net/dav.php/calendars"
 #auth = digest
 username = "task"
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
-
-# UNI
-[pair uni]
-a = "uni_local"
-b = "uni_remote"
-collections = null
-
-[storage uni_local]
-type = "filesystem"
-path = "~/.vdirsyncer/uni"
-fileext = ".ics"
-
-[storage uni_remote]
-type = "http"
-url = "http://persoonlijkrooster.ru.nl/ical?57b59e14&eu=czQxMDk1MDM=&t=9d96e939-2d1b-4b49-b376-93937bc08725"