Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: a5e9668c5c2a43703a4f49ae673909c66acf7785
https://github.com/NixOS/nixpkgs/commit/a5e9668c5c2a43703a4f49ae673909c66acf7785
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M nixos/lib/test-driver/Machine.pm
Log Message:
-----------
nixos/test: Fix escaping for copyFileFromHost
A long-time issue and one of the reasons I've never used that function
before. So let's remove that todo-comment and escape the contents
properly.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Cc: @edolstra
Commit: 32c2e8f4aeea5a35302b450ed4233dd1af6b22c8
https://github.com/NixOS/nixpkgs/commit/32c2e8f4aeea5a35302b450ed4233dd1af6b22c8
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M nixos/modules/services/misc/taskserver/helper-tool.py
Log Message:
-----------
taskserver/helpertool: Fix error message on export
The error message displays that a specific user doesn't exist in an
organisation, but uses the User object's name attribute to show which
user it was.
This is basically a very stupid chicken and egg problem and easily fixed
by using the user name provided on the command line.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 78fe00da7c2d6c4e5746558f366e1c8fbf97fb47
https://github.com/NixOS/nixpkgs/commit/78fe00da7c2d6c4e5746558f366e1c8fbf97fb47
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M nixos/modules/services/misc/taskserver/default.nix
M nixos/modules/services/misc/taskserver/doc.xml
M nixos/modules/services/misc/taskserver/helper-tool.py
Log Message:
-----------
taskserver: Allow helper tool in manual config
The helper tool so far was only intended for use in automatic PKI
handling, but it also is very useful if you have an existing CA.
One of the main advantages is that you don't need to specify the data
directory anymore and the right permissions are also handled as well.
Another advantage is that we now have an uniform management tool for
both automatic and manual config, so the documentation in the NixOS
manual now applies to the manual PKI config as well.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: c7bbb93878a0b9772c34a6c19eb3f1b15a82a345
https://github.com/NixOS/nixpkgs/commit/c7bbb93878a0b9772c34a6c19eb3f1b15a82a345
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M nixos/modules/services/misc/taskserver/default.nix
Log Message:
-----------
taskserver: Pass configuration via command line
Putting an include directive in the configuration file referencing a
store path with the real configuration file has the disavantage that
once we change the real configuration file the store path is also a
different one.
So we would have to replace that include directive with the new
configuration file, which is very much error-prone, because whenever
taskd modifies the configuration file on its own it generates a new one
with *only* the key/value options and without any include directives.
Another problem is that we only added the include directive on the first
initalization, so whenever there is *any* configuration change, it won't
affect anything.
We're now passing all the configuration options via command line,
because taskd treats everything in the form of --<name>=<value> to be a
configuration directive.
This also has the effect that we now no longer have extraConfig, because
configuration isn't a file anymore.
Instead we now have an attribute set that is mapped down to
configuration options.
Unfortunately this isn't so easy with the way taskd is configured,
because there is an option called "server" and also other options like
"server.cert", "server.key" and so on, which do not map very well to
attribute sets.
So we have an exception for the "server" option, which is now called
"server.listen", because it specifies the listening address.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Fixes: #22705
Commit: 5af8b120a6d5e8abaf2e0397e9ac077a3ab33897
https://github.com/NixOS/nixpkgs/commit/5af8b120a6d5e8abaf2e0397e9ac077a3ab33897
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M nixos/tests/taskserver.nix
Log Message:
-----------
nixos/tests/taskserver: Add test for manual config
This subtest actually serves two purposes:
1. Test manual PKI configuration
2. Test changing of configuration files
In order to only test manual PKI configuration it would have been enough
to just add another server with a manual config.
But as the switch from automatic PKI config to manual config is probably
one of the most fundamental changes in configuration, so it serves
*very* well to also check whether changes in the NixOS configuration
actually have an impact in the real system.
So instead of adding another server, we now create a dummy "newServer"
machine, which is the new configuration for "server" and use
switch-to-configuration to switch "server" to the config of "newServer".
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Commit: 08881b8cbe03a058310eb62aa316dbd095682e59
https://github.com/NixOS/nixpkgs/commit/08881b8cbe03a058310eb62aa316dbd095682e59
Author: aszlig <asz...@redmoonstudios.org>
Date: 2017-02-17 (Fri, 17 Feb 2017)
Changed paths:
M nixos/modules/services/misc/taskserver/default.nix
Log Message:
-----------
taskserver: Remove taskserver from systemPackages
This is deliberate because using the taskd binary to configure
Taskserver has a good chance of messing up permissions.
The nixos-taskserver tool now can manage even manual configurations, so
there really is no need anymore to expose the taskd binary.
If people still want to use the taskd binary at their own risk they can
still add taskserver to systemPackages themselves.
Signed-off-by: aszlig <asz...@redmoonstudios.org>
Compare: https://github.com/NixOS/nixpkgs/compare/5231d0ac290f...08881b8cbe03_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
