From 8d7875d174cff81e7e654f671ed22e4a3b2d3a3e Mon Sep 17 00:00:00 2001
From: Nemo <commits@captnemo.in>
Date: Wed, 14 Apr 2021 12:30:35 +0530
Subject: [PATCH] Fix radicale
---
radicale/config | 5 ++---
radicale/main.tf | 43 +++++++++----------------------------------
2 files changed, 7 insertions(+), 41 deletions(-)
diff --git a/radicale/config b/radicale/config
index f0a9a1a..86d2d10 100644
--- a/radicale/config
+++ a/radicale/config
@@ -5,9 +5,6 @@
# Max parallel connections
max_connections = 10
-# Message displayed in the client when a password is needed
-realm = Authentication required
-
[auth]
# Authentication method
@@ -19,6 +16,8 @@
filesystem_folder = /data/collections
[logging]
+
+level = warning
# For more information about the syntax of the configuration file, see:
# http://docs.python.org/library/logging.config.html
diff --git a/radicale/main.tf b/radicale/main.tf
index b11f71f..35c05d9 100644
--- a/radicale/main.tf
+++ a/radicale/main.tf
@@ -35,64 +35,31 @@
# Max parallel connections
max_connections = 10
-# Message displayed in the client when a password is needed
-realm = Authentication required
-
[auth]
-
# Authentication method
# Value: none | htpasswd | remote_user | http_x_remote_user
type = htpasswd
htpasswd_filename = /config/users
+htpasswd_encryption = bcrypt
[storage]
filesystem_folder = /data/collections
[logging]
-
-# For more information about the syntax of the configuration file, see:
-# http://docs.python.org/library/logging.config.html
-# config = /config/logging
+level=warning
[headers]
-
# Additional HTTP headers
X-Powered-By: Allomancy
Server: Blackbox
EOT
-
- file = "/config/config"
+ file = "/config/config"
},
{
content = <<EOT
-[loggers]
-keys = root
-
-[handlers]
-keys = file
-
-[formatters]
-keys = full
-
-[logger_root]
-# Change this to DEBUG or INFO for higher verbosity.
-level = WARNING
-handlers = file
-
-[handler_file]
-class = FileHandler
-# Specify the output file here.
-args = ('/var/log/radicale/log',)
-formatter = full
-
-[formatter_full]
-format = %(asctime)s - [%(thread)x] %(levelname)s: %(message)s
+nemo:$2y$05$vC1WTAuKn2xuDYZ6I3ucxuPnCrtZrVKzdDHSYhqCegi97RM/pdzXW
+axy:$2b$10$iqCLs3F1IRDBoSGxGlsOFO9C3peh8QH14hMnHN4o6oqu21PWL9vu2
EOT
-
- file = "/config/logging"
- },
- {
- content = "nemo:$2y$05$vC1WTAuKn2xuDYZ6I3ucxuPnCrtZrVKzdDHSYhqCegi97RM/pdzXW"
file = "/config/users"
},
]
--
rgit 0.1.5