From 96e3462774dcc5a09ed9ef42e51276b204cf1d05 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 17 May 2018 09:47:19 +0200
Subject: [PATCH] New calendar server

---
 cal/.config/khard/khard.conf  |  2 +-
 cal/.config/vdirsyncer/config | 72 +++++++++++++++++------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/cal/.config/khard/khard.conf b/cal/.config/khard/khard.conf
index 6fb1000..7cc3b0b 100644
--- a/cal/.config/khard/khard.conf
+++ b/cal/.config/khard/khard.conf
@@ -1,6 +1,6 @@
 [addressbooks]
 [[dav]]
-path = ~/.vdirsyncer/card/addresses
+path = ~/.vdirsyncer/card/default
 
 [general]
 editor = vim
diff --git a/cal/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config
index 90956df..f52762c 100644
--- a/cal/.config/vdirsyncer/config
+++ b/cal/.config/vdirsyncer/config
@@ -25,8 +25,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"]
 
@@ -43,41 +43,41 @@ 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"
+#b = "tasks_remote"
+#conflict_resolution = "a wins"
+#collections = ["from b"]
 #
-# 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"
-#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"
+#[storage tasks_local]
+#type = "filesystem"
+#path = "~/.vdirsyncer/tasks"
+#fileext = ".ics"
+#
+#[storage tasks_remote]
+#type = "caldav"
+#url = "https://cal.martlubbers.net/caldav.php/task"
+##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"
-- 
2.20.1