This commit readds and updates the 1.x package from 1.1.4 to 1.1.6 which also includes the needed command for migrating to 2.x The module is adjusted to the version change, defaulting to radicale2 if stateVersion >= 17.09 and radicale1 otherwise. It also now uses ExecStart instead of the script service attribute. Some missing dots at the end of sentences were also added. I added a paragraph in the release notes on how to update to a newer version.wip/yesman
Silvan Mosberger
7 years ago
parent
5bc183ebf8
commit
e16a0988bc
@ -1,80 +1,39 @@ |
||||
let |
||||
port = 5232; |
||||
radicaleOverlay = self: super: { |
||||
radicale = super.radicale.overrideAttrs (oldAttrs: { |
||||
propagatedBuildInputs = with self.pythonPackages; |
||||
(oldAttrs.propagatedBuildInputs or []) ++ [ |
||||
passlib |
||||
]; |
||||
}); |
||||
}; |
||||
common = { config, pkgs, ...}: { |
||||
user = "someuser"; |
||||
password = "some_password"; |
||||
port = builtins.toString 5232; |
||||
in |
||||
import ./make-test.nix ({ pkgs, lib, ... }: { |
||||
name = "radicale"; |
||||
meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; |
||||
|
||||
machine = { |
||||
services.radicale = { |
||||
enable = true; |
||||
config = let home = config.users.extraUsers.radicale.home; in '' |
||||
[server] |
||||
hosts = 127.0.0.1:${builtins.toString port} |
||||
daemon = False |
||||
[encoding] |
||||
[well-known] |
||||
config = '' |
||||
[auth] |
||||
type = htpasswd |
||||
htpasswd_filename = /etc/radicale/htpasswd |
||||
htpasswd_encryption = bcrypt |
||||
[git] |
||||
[rights] |
||||
|
||||
[storage] |
||||
type = filesystem |
||||
filesystem_folder = ${home}/collections |
||||
filesystem_folder = /tmp/collections |
||||
|
||||
[logging] |
||||
[headers] |
||||
debug = True |
||||
''; |
||||
}; |
||||
# WARNING: DON'T DO THIS IN PRODUCTION! |
||||
# This puts secrets (albeit hashed) directly into the Nix store for ease of testing. |
||||
environment.etc."radicale/htpasswd".source = with pkgs; let |
||||
py = python.withPackages(ps: with ps; [ passlib ]); |
||||
in runCommand "htpasswd" {} '' |
||||
${py}/bin/python -c " |
||||
from passlib.apache import HtpasswdFile |
||||
ht = HtpasswdFile( |
||||
'$out', |
||||
new=True, |
||||
default_scheme='bcrypt' |
||||
) |
||||
ht.set_password('someuser', 'really_secret_password') |
||||
ht.save() |
||||
" |
||||
environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} '' |
||||
${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password} |
||||
''; |
||||
}; |
||||
|
||||
in import ./make-test.nix ({ lib, ... }: { |
||||
name = "radicale"; |
||||
meta.maintainers = with lib.maintainers; [ aneeshusa ]; |
||||
|
||||
# Test radicale with bcrypt-based htpasswd authentication |
||||
nodes = { |
||||
py2 = { config, pkgs, ... }@args: (common args) // { |
||||
nixpkgs.overlays = [ |
||||
radicaleOverlay |
||||
]; |
||||
}; |
||||
py3 = { config, pkgs, ... }@args: (common args) // { |
||||
nixpkgs.overlays = [ |
||||
(self: super: { |
||||
python = self.python3; |
||||
pythonPackages = self.python3.pkgs; |
||||
}) |
||||
radicaleOverlay |
||||
]; |
||||
}; |
||||
}; |
||||
|
||||
|
||||
# This tests whether the web interface is accessible to an authenticated user |
||||
testScript = '' |
||||
for my $machine ($py2, $py3) { |
||||
$machine->waitForUnit('radicale.service'); |
||||
$machine->waitForOpenPort(${builtins.toString port}); |
||||
$machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/'); |
||||
} |
||||
$machine->waitForUnit('radicale.service'); |
||||
$machine->waitForOpenPort(${port}); |
||||
$machine->succeed('curl --fail http://${user}:${password}@localhost:${port}/.web/'); |
||||
''; |
||||
}) |
||||
|
||||
@ -0,0 +1,34 @@ |
||||
{ stdenv, fetchurl, pythonPackages }: |
||||
|
||||
pythonPackages.buildPythonApplication rec { |
||||
name = "radicale-${version}"; |
||||
version = "1.1.6"; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz"; |
||||
sha256 = "0ay90nj6fmr2aq8imi0mbjl4m2rzq7a83ikj8qs9gxsylj71j1y0"; |
||||
}; |
||||
|
||||
propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [ |
||||
pythonPackages.flup |
||||
pythonPackages.ldap |
||||
pythonPackages.sqlalchemy |
||||
]; |
||||
|
||||
doCheck = !pythonPackages.isPy3k; |
||||
|
||||
meta = with stdenv.lib; { |
||||
homepage = http://www.radicale.org/; |
||||
description = "CalDAV CardDAV server"; |
||||
longDescription = '' |
||||
The Radicale Project is a complete CalDAV (calendar) and CardDAV |
||||
(contact) server solution. Calendars and address books are available for |
||||
both local and remote access, possibly limited through authentication |
||||
policies. They can be viewed and edited by calendar and contact clients |
||||
on mobile phones or computers. |
||||
''; |
||||
license = licenses.gpl3Plus; |
||||
platforms = platforms.all; |
||||
maintainers = with maintainers; [ edwtjo pSub aneeshusa ]; |
||||
}; |
||||
} |
||||
Loading…
Reference in new issue