summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorHenri Menke <henri@henrimenke.de>2020-11-29 10:58:16 +0100
committerAntoine Eiche <lewo@abesis.fr>2020-11-29 20:19:46 +0100
commit89bd89c706c9862c6980cdf18a74ad041f98dc76 (patch)
tree0e18e76223b830ed8022466f3bdd17bcaa4af6a4 /docs
parentc00fc587f5cbdc9e498f00a6ec6dafe164c00289 (diff)
Recommend bcrypt passwords everywhere
Diffstat (limited to 'docs')
-rw-r--r--docs/howto-add-radicale.rst6
-rw-r--r--docs/quick-start.rst2
-rw-r--r--docs/setup-guide.rst2
3 files changed, 7 insertions, 3 deletions
diff --git a/docs/howto-add-radicale.rst b/docs/howto-add-radicale.rst
index 824e363..ea01d5b 100644
--- a/docs/howto-add-radicale.rst
+++ b/docs/howto-add-radicale.rst
@@ -3,6 +3,10 @@ How to Add Radicale to SNM
Configuration by @dotlambda
+Starting with Radicale 3 (first introduced in NixOS 20.09) the traditional
+crypt passwords, as generated by `mkpasswd`, are no longer supported. Instead
+bcrypt passwords have to be used which can be generated using `htpasswd`.
+
.. code:: nix
{ config, pkgs, lib, ... }:
@@ -24,7 +28,7 @@ Configuration by @dotlambda
[auth]
type = htpasswd
htpasswd_filename = ${htpasswd}
- htpasswd_encryption = crypt
+ htpasswd_encryption = bcrypt
'';
};
diff --git a/docs/quick-start.rst b/docs/quick-start.rst
index e52afe8..7a7015f 100644
--- a/docs/quick-start.rst
+++ b/docs/quick-start.rst
@@ -20,7 +20,7 @@ Quick Start
domains = [ "example.com" "example2.com" ];
loginAccounts = {
"user1@example.com" = {
- # mkpasswd -m sha-512 "super secret password" > /hashed/password/file/location
+ # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2 > /hashed/password/file/location
hashedPasswordFile = "/hashed/password/file/location";
aliases = [
diff --git a/docs/setup-guide.rst b/docs/setup-guide.rst
index 1f0617a..ef2a76b 100644
--- a/docs/setup-guide.rst
+++ b/docs/setup-guide.rst
@@ -46,7 +46,7 @@ should be the most common ones.
domains = [ <domains> ];
# A list of all login accounts. To create the password hashes, use
- # mkpasswd -m sha-512 "super secret password"
+ # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2
loginAccounts = {
"user1@example.com" = {
hashedPassword = "$6$/z4n8AQl6K$kiOkBTWlZfBd7PvF5GsJ8PmPgdZsFGN1jPGZufxxr60PoR0oUsrvzm2oQiflyz5ir9fFJ.d/zKm/NgLXNUsNX/";