From 1d8bbcf8d23890bcce0d30810f4dfdafbf25b259 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 17 Feb 2015 17:48:27 +0100 Subject: .vdirsyncer/config: Adding password_command and changing settings to reflect updated version of the config and server location. --- .vdirsyncer/config | 104 ++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 66 deletions(-) (limited to '.vdirsyncer/config') diff --git a/.vdirsyncer/config b/.vdirsyncer/config index 1b190f7..23beea9 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -1,41 +1,36 @@ -# An example configuration for vdirsyncer. +#An example configuration for vdirsyncer. # Optional parameters are commented out. - +# This file doesn't document all available parameters, see +# http://vdirsyncer.readthedocs.org/ for the rest of them. [general] # A folder where vdirsyncer can store some metadata about each pair. status_path = ~/.vdirsyncer/status/ +password_command = pass2vdirsyncer # CARDDAV + [pair dave_contacts] + # A `[pair ]` block defines two storages `a` and `b` that should be # synchronized. The definition of these storages follows in `[storage ]` # blocks. This is similar to accounts in OfflineIMAP. a = dave_contacts_local b = dave_contacts_remote -# If you want to synchronize several addressbooks, calendars etc that share -# the same storage location and differ only in a suffix to this location -# (i.e., a subdirectory) you can use collections. The comma-separated values -# in this parameter represent these subdirectories and are added as URL -# segments or similar. - -# Together with the definition of the following two `[storage]` blocks below -# in this example it means that -# - https://owncloud.example.com/remote.php/carddav/addressbooks/bob/default/ -# will get synced with ~/.contacts/default/ -# - https://owncloud.example.com/remote.php/carddav/addressbooks/bob/work/ -# will get synced with ~/.contacts/work/ - +# Synchronize all collections available on "side B" (in this case the server). +# You need to run `vdirsyncer discover` if new calendars/addressbooks are added +# on the server. # Omitting this parameter implies that the given path and URL in the -# corresponding `[storage ]` blocks are already pointing to a +# corresponding `[storage ]` blocks are already directly pointing to a # collection each. -collections = akt,bands,funkhaus,personal,pool,restaurants,service,tu-berlin,venues +#collections = ["from b"] +collections = ["akt","bands","private","services","tu-berlin","unixpool", "venues"] # To resolve a conflict the following values are possible: -# `None` - abort when collisions occur (default) -# `a wins` - assume a's items to be more up-to-date -# `b wins` - assume b's items to be more up-to-date -#conflict_resolution = None +# `null` - abort when collisions occur (default) +# `"a wins"` - assume a's items to be more up-to-date +# `"b wins"` - assume b's items to be more up-to-date +#conflict_resolution = null [storage dave_contacts_local] # A storage references actual data on a remote server or on the local disk. @@ -43,60 +38,37 @@ collections = akt,bands,funkhaus,personal,pool,restaurants,service,tu-berlin,ven type = filesystem path = ~/.contacts/ fileext = .vcf -# Create the directory if it doesn't exist: `True` or `False` -#create = True -#encoding = utf-8 [storage dave_contacts_remote] type = carddav -read_only = True -url = https://cloud.frqrec.com/remote.php/carddav/addressbooks/dave/ -verify = False -# Auth types. If you know yours, set it explicitly for performance. -# - basic -# - digest -# - guess (default) -#auth = guess -username = dave -# The password can also be fetched from the system password storage or netrc -#password = - -# CALDAV -[pair dave_calendars] -a = dave_calendars_local -b = dave_calendars_remote -collections = private,pool,frqrec,courses - -[storage dave_calendars_local] -type = filesystem -path = ~/.calendars/ -fileext = .ics +#url = https://owncloud.example.com/remote.php/carddav/ +url = https://cloud.sleepmap.de/remote.php/carddav/ +verify = "~/.certs/sleepmap.crt" +#verify = false -[storage dave_calendars_remote] -type = caldav -read_only = True -url = https://cloud.frqrec.com/remote.php/caldav/calendars/dave/ -verify = False -#auth = guess -username = dave +#username = +# The password can also be fetched from the system password storage, netrc or a +# custom command. See http://vdirsyncer.readthedocs.org/en/stable/keyring.html #password = +username = dave # CALDAV -[pair funkhaus_calendars] -a = funkhaus_calendars_local -b = funkhaus_calendars_remote -collections = room - -[storage funkhaus_calendars_local] +[pair dave_calendar] +a = dave_calendar_local +b = dave_calendar_remote +#collections = ["private", "work"] +collections = ["contact_birthdays", "private", "unix-pool", "courses", "live", "concerts", "d228"] +[storage dave_calendar_local] type = filesystem path = ~/.calendars/ fileext = .ics - -[storage funkhaus_calendars_remote] +[storage dave_calendar_remote] type = caldav -read_only = True -url = https://cloud.frqrec.com/remote.php/caldav/calendars/funkhaus-d228/ -verify = False -#auth = guess -username = funkhaus-d228 +#url = https://owncloud.example.com/remote.php/caldav/ +url = https://cloud.sleepmap.de/remote.php/caldav/ +verify = "~/.certs/sleepmap.crt" +#verify = false +#username = #password = +username = dave + -- cgit v1.2.3-70-g09d2 From 9e1d9c25d66a9735e1bdb15c0720b7911f1cd81b Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 3 Mar 2015 15:21:57 +0100 Subject: .vdirsyncer/config: Adding b wins as conflict resolution. --- .vdirsyncer/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.vdirsyncer/config') diff --git a/.vdirsyncer/config b/.vdirsyncer/config index 23beea9..e8ec980 100644 --- a/.vdirsyncer/config +++ b/.vdirsyncer/config @@ -30,7 +30,7 @@ collections = ["akt","bands","private","services","tu-berlin","unixpool", "venue # `null` - abort when collisions occur (default) # `"a wins"` - assume a's items to be more up-to-date # `"b wins"` - assume b's items to be more up-to-date -#conflict_resolution = null +conflict_resolution = "b wins" [storage dave_contacts_local] # A storage references actual data on a remote server or on the local disk. -- cgit v1.2.3-70-g09d2