tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change "calendar" into "collection" when needed.

Browse Source 
WARNING: the default folders storing calendars/addressbooks have been changed
This commit is contained in:
Guillaume Ayoub 2012-01-25 14:53:46 +01:00
parent d5b1cdcbf2
commit 4299348776
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config
View File

@ -30,7 +30,7 @@ key = /etc/apache2/ssl/server.key
[encoding] [encoding]
# Encoding for responding requests # Encoding for responding requests
request = utf-8 request = utf-8
# Encoding for storing local calendars # Encoding for storing local collections
stock = utf-8 stock = utf-8
@ -39,9 +39,9 @@ stock = utf-8
# Value: None | htpasswd | LDAP | PAM | courier # Value: None | htpasswd | LDAP | PAM | courier
type = None type = None
# Usernames used for public calendars, separated by a comma # Usernames used for public collections, separated by a comma
public_users = public public_users = public
# Usernames used for private calendars, separated by a comma # Usernames used for private collections, separated by a comma
private_users = private private_users = private
# Htpasswd filename # Htpasswd filename
@ -75,11 +75,11 @@ courier_socket =
# Storage backend # Storage backend
type = filesystem type = filesystem
# Folder for storing local calendars, created if not present # Folder for storing local collections, created if not present
filesystem_folder = ~/.config/radicale/calendars filesystem_folder = ~/.config/radicale/collections
# Git repository for storing local calendars, created if not present # Git repository for storing local collections, created if not present
filesystem_folder = ~/.config/radicale/calendars filesystem_folder = ~/.config/radicale/collections
[logging] [logging]

2
radicale/__main__.py
View File

@ -111,7 +111,7 @@ def run():
atexit.register(cleanup) atexit.register(cleanup)
radicale.log.LOGGER.info("Starting Radicale") radicale.log.LOGGER.info("Starting Radicale")
# Create calendar servers # Create collection servers
servers = [] servers = []
server_class = radicale.HTTPSServer if options.ssl else radicale.HTTPServer server_class = radicale.HTTPSServer if options.ssl else radicale.HTTPServer
shutdown_program = threading.Event() shutdown_program = threading.Event()

4
radicale/config.py
View File

@ -65,9 +65,9 @@ INITIAL_CONFIG = {
"storage": { "storage": {
"type": "filesystem", "type": "filesystem",
"filesystem_folder": "filesystem_folder":
os.path.expanduser("~/.config/radicale/calendars"), os.path.expanduser("~/.config/radicale/collections"),
"git_folder": "git_folder":
os.path.expanduser("~/.config/radicale/calendars")}, os.path.expanduser("~/.config/radicale/collections")},
"logging": { "logging": {
"config": "/etc/radicale/logging", "config": "/etc/radicale/logging",
"debug": "False", "debug": "False",

2
setup.py
View File

@ -58,7 +58,7 @@ setup(
packages=["radicale", "radicale.acl", "radicale.storage"], packages=["radicale", "radicale.acl", "radicale.storage"],
provides=["radicale"], provides=["radicale"],
scripts=["bin/radicale"], scripts=["bin/radicale"],
keywords=["calendar", "CalDAV"], keywords=["calendar", "addressbook", "CalDAV", "CardDAV"],
classifiers=[ classifiers=[
"Development Status :: 4 - Beta", "Development Status :: 4 - Beta",
"Environment :: Console", "Environment :: Console",