Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 5231d0ac290f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 08881b8cbe03
Choose a head ref
  • 6 commits
  • 5 files changed
  • 1 contributor

Commits on Feb 17, 2017

  1. 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 <aszlig@redmoonstudios.org>
Cc: @edolstra
    @aszlig
    aszlig committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    a5e9668 View commit details
    Browse the repository at this point in the history

  2. 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 <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    32c2e8f View commit details
    Browse the repository at this point in the history

  3. 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 <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    78fe00d View commit details
    Browse the repository at this point in the history

  4. 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 <aszlig@redmoonstudios.org>
Fixes: #22705
    @aszlig
    aszlig committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    c7bbb93 View commit details
    Browse the repository at this point in the history

  5. 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 <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    5af8b12 View commit details
    Browse the repository at this point in the history

  6. 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 <aszlig@redmoonstudios.org>
    @aszlig
    aszlig committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    08881b8 View commit details
    Browse the repository at this point in the history