X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=cal%2F.config%2Fvdirsyncer%2Fconfig;h=ceddd8a142f969e0ad62f9bf1555fcc7b12faecf;hb=7637ae4790f12008ff27ba2134153ce20296a6fa;hp=aaf932660d9d54f5880c2d569455723388221550;hpb=1e6011180d858018ccaf465cfbd36904acbbb7b7;p=dotfiles.git

diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index aaf9326..ceddd8a 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -9,24 +9,71 @@
 
 [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"
 
+# Webcal
+[pair uni]
+a = "uni_web"
+b = "uni_remote"
+collections = null
+
+[storage uni_web]
+type = "http"
+url = "https://persoonlijkrooster.ru.nl/ical?612f428e&group=false&eu=VTUzMTE1OA==&h=fwIseCt7TiLdsmZedg33fpvCIrs00_mKW4-HN0jjCWA="
+
+[storage uni_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars/mart/uni/"
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+[pair vuilnis]
+a = "vuilnis_web"
+b = "vuilnis_remote"
+collections = null
+
+[storage vuilnis_web]
+type = "http"
+url = "https://wasteapi.ximmio.com/api/CallIcal?cn=Gemeente%20Almere&x=53d8db94-7945-42fd-9742-9bbc71dbe4c1&ty=null&ua=11219&sd=2020-12-21&ed=2024-01-09&path=https://wasteapi.ximmio.com&ln=nl&nt=1130"
+
+[storage vuilnis_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars/mart/vuilnis/"
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
+[pair swsseminar]
+a = "sws_web"
+b = "sws_remote"
+collections = null
+
+[storage sws_web]
+type = "http"
+url = "webcal://mail.ru.nl/owa/calendar/b6e050a43db94f69b7f22d03b199e2d3@ru.nl/d9d2aad2370a45e384cdd0df82dc0372275936403019441775/S-1-8-3775058472-2008174625-2090802342-630350554/reachcalendar.ics"
+
+[storage sws_remote]
+type = "caldav"
+url = "https://cal.martlubbers.net/dav.php/calendars/mart/swsseminar/"
+username = "mart"
+password.fetch = ["command", "pass", "show", "caldav_ygdrassil/mart"]
+
 # CARDDAV
 [pair contacts]
 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 +82,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 +105,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"