X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=670e6aa9e190493214ae761bf947dcee98c7277e;hb=152a45858cd5fcd0fd101f650da3b416c10652b3;hp=b80f300adb72eb371ee95e7f6ce071f1e5d6335c;hpb=75f3a552c1b9dcaeead05882a94e6805375be506;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index b80f300..670e6aa 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -15,8 +15,7 @@ status_path = ~/.vdirsyncer/status/
 [pair contacts]
 a = contacts_local
 b = contacts_remote
-conflict_resolution = a wins
-collections = ["default"]
+collections = ["from b"]
 
 [storage contacts_local]
 type = filesystem
@@ -25,8 +24,8 @@ fileext = .vcf
 
 [storage contacts_remote]
 type = carddav
-url = https://ygdrassil.martlubbers.net/baikal/card.php/addressbooks/mart/default
-auth = digest
+url = https://cal.martlubbers.net/caldav.php/mart
+#auth = digest
 username = mart
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
@@ -34,8 +33,7 @@ password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 [pair calendar]
 a = calendar_local
 b = calendar_remote
-conflict_resolution = a wins
-collections = ["default", "mart", "elvira", "vuilnis"]
+collections = ["from b"]
 
 [storage calendar_local]
 type = filesystem
@@ -44,17 +42,17 @@ fileext = .ics
 
 [storage calendar_remote]
 type = caldav
-url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart/default
-auth = digest
+url = https://cal.martlubbers.net/caldav.php/mart
+#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 = ["default"]
+collections = ["from b"]
 
 [storage tasks_local]
 type = filesystem
@@ -63,9 +61,9 @@ fileext = .ics
 
 [storage tasks_remote]
 type = caldav
-url = https://ygdrassil.martlubbers.net/baikal/cal.php/calendars/mart2/default
-auth = digest
-username = mart2
+url = https://cal.martlubbers.net/caldav.php/task
+#auth = digest
+username = task
 password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
 
 # UNI