X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=8b360183bcd3b0c7fa2699de5c42f49d5bc3ff01;hb=03456357bce935f8e8af9580a1f31a3ac8ea6cac;hp=90956dfab9970117b0870eb4e34f14ee64c79fd5;hpb=305f4e53aba70e6660e927bd26946e338dce6251;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 90956df..8b36018 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -17,6 +17,7 @@ status_path = "~/.vdirsyncer/status/"
 a = "contacts_local"
 b = "contacts_remote"
 collections = ["from b"]
+conflict_resolution = "b wins"
 
 [storage contacts_local]
 type = "filesystem"
@@ -25,8 +26,8 @@ fileext = ".vcf"
 
 [storage contacts_remote]
 type = "carddav"
-url = "https://cal.martlubbers.net/dav.php/"
-#auth = digest
+url = "https://cal.martlubbers.net/dav.php/addressbooks"
+#auth = "digest"
 username = "mart"
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
@@ -35,6 +36,7 @@ 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"
@@ -43,11 +45,11 @@ fileext = ".ics"
 
 [storage calendar_remote]
 type = "caldav"
-url = "https://cal.martlubbers.net/dav.php/"
+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"
@@ -62,22 +64,7 @@ fileext = ".ics"
 
 [storage tasks_remote]
 type = "caldav"
-url = "https://cal.martlubbers.net"
+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"