mirrors/Radicale
1
0
Fork 0
mirror of https://github.com/Kozea/Radicale.git synced 2025-04-05 22:27:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

allow config override from commandline

Browse source
This commit is contained in:
Yohann Rebattu 2016-10-11 18:17:01 +02:00
parent 0c1dbc30bd
commit 11710f75a8
2 changed files with 104 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

79
radicale/config.py
View file

@ -24,48 +24,49 @@ Give a configparser-like interface to read and write configuration.
"""
import os
from collections import OrderedDict
from configparser import RawConfigParser as ConfigParser
# Default configuration
INITIAL_CONFIG = {
"server": {
"hosts": "0.0.0.0:5232",
"daemon": "False",
"pid": "",
"max_connections": "20",
"max_content_length": "10000000",
"timeout": "10",
"ssl": "False",
"certificate": "/etc/apache2/ssl/server.crt",
"key": "/etc/apache2/ssl/server.key",
"protocol": "PROTOCOL_SSLv23",
"ciphers": "",
"dns_lookup": "True",
"base_prefix": "/",
"can_skip_base_prefix": "False",
"realm": "Radicale - Password Required"},
"encoding": {
"request": "utf-8",
"stock": "utf-8"},
"auth": {
"type": "None",
"htpasswd_filename": "/etc/radicale/users",
"htpasswd_encryption": "crypt"},
"rights": {
"type": "None",
"file": "~/.config/radicale/rights"},
"storage": {
"type": "multifilesystem",
"filesystem_folder": os.path.expanduser(
"~/.config/radicale/collections"),
"fsync": "True",
"hook": "",
"close_lock_file": "False"},
"logging": {
"config": "/etc/radicale/logging",
"debug": "False",
"full_environment": "False",
"mask_passwords": "True"}}
INITIAL_CONFIG = OrderedDict([
("server", OrderedDict([
("hosts", "0.0.0.0:5232"),
("daemon", "False"),
("pid", ""),
("max_connections", "20"),
("max_content_length", "10000000"),
("timeout", "10"),
("ssl", "False"),
("certificate", "/etc/apache2/ssl/server.crt"),
("key", "/etc/apache2/ssl/server.key"),
("protocol", "PROTOCOL_SSLv23"),
("ciphers", ""),
("dns_lookup", "True"),
("base_prefix", "/"),
("can_skip_base_prefix", "False"),
("realm", "Radicale - Password Required")])),
("encoding", OrderedDict([
("request", "utf-8"),
("stock", "utf-8")])),
("auth", OrderedDict([
("type", "None"),
("htpasswd_filename", "/etc/radicale/users"),
("htpasswd_encryption", "crypt")])),
("rights", OrderedDict([
("type", "None"),
("file", "~/.config/radicale/rights")])),
("storage", OrderedDict([
("type", "multifilesystem"),
("filesystem_folder", os.path.expanduser(
"~/.config/radicale/collections")),
("fsync", "True"),
("hook", ""),
("close_lock_file", "False")])),
("logging", OrderedDict([
("config", "/etc/radicale/logging"),
("debug", "False"),
("full_environment", "False"),
("mask_passwords", "True")]))])
def load(paths=(), extra_config=None):