diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 00:09:23 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-04-15 00:21:49 +0200 |
| commit | 9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a (patch) | |
| tree | aa329b42d1b7aacab037422f98f1895d59394bde /nixos/doc | |
| parent | 0876c2f4ac96b902285642144bcd4408aa57f511 (diff) | |
| parent | c36d6e59647794aa1c4dbb2dcd7e5242d9c5b6b8 (diff) | |
| download | nixlib-9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a.tar nixlib-9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a.tar.gz nixlib-9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a.tar.bz2 nixlib-9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a.tar.lz nixlib-9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a.tar.xz nixlib-9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a.tar.zst nixlib-9ed9e268a2fea24729a5ee09cbecb5f4f7f7605a.zip | |
Merge pull request #14476 (taskserver)
This adds a Taskserver module along with documentation and a small helper tool which eases managing a custom CA along with Taskserver organisations, users and groups. Taskserver is the server component of Taskwarrior, a TODO list application for the command line. The work has been started by @matthiasbeyer back in mid 2015 and I have continued to work on it recently, so this merge contains commits from both of us. Thanks particularly to @nbp and @matthiasbeyer for reviewing and suggesting improvements. I've tested this with the new test (nixos/tests/taskserver.nix) this branch adds and it fails because of the changes introduced by the closure-size branch, so we need to do additional work on base of this.
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 1 | ||||
| -rw-r--r-- | nixos/doc/manual/default.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index fb3f1498a9b7..cfa5619938bb 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -27,6 +27,7 @@ effect after you run <command>nixos-rebuild</command>.</para> <!-- FIXME: auto-include NixOS module docs --> <xi:include href="postgresql.xml" /> <xi:include href="gitlab.xml" /> +<xi:include href="taskserver.xml" /> <xi:include href="acme.xml" /> <xi:include href="input-methods.xml" /> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 69da1f948829..86a39322ba51 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -57,6 +57,7 @@ let chmod -R u+w . cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml + cp ${../../modules/services/misc/taskserver/doc.xml} configuration/taskserver.xml cp ${../../modules/security/acme.xml} configuration/acme.xml cp ${../../modules/i18n/input-method/default.xml} configuration/input-methods.xml ln -s ${optionsDocBook} options-db.xml |