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: 0ce6e32cb78e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b58a230c60c3
Choose a head ref
  • 6 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 8, 2018

  1. sks: Copy the web examples to $webSamples for the module

    @primeos
    primeos committed Sep 8, 2018
    Copy the full SHA
    d02c6a5 View commit details
    Browse the repository at this point in the history

  2. nixos/sks: Add a webroot option 

    The module will now, by default, serve a simple webpage via the built-in
web server (instead of displaying an error message).
    @primeos
    primeos committed Sep 8, 2018
    Copy the full SHA
    a0d3d09 View commit details
    Browse the repository at this point in the history

  3. sks: Adapt the package to NixOS (pkgs.db provides only "db_stat")

    @primeos
    primeos committed Sep 8, 2018
    Copy the full SHA
    a6934b2 View commit details
    Browse the repository at this point in the history

  4. nixos/sks: Use a group and don't add sks to systemPackages 

    Without a group the gid will default to 65534 (2^16 - 2) which maps to
"nogroup". IMO it makes more sense to explicitly set a valid group.

Adding pkgs.sks to environment.systemPackages is not required (IIRC we
want to avoid bloating environment.systemPackages). Instead it seems
like a better idea to make the relevant binaries available to the user
sks and enable useDefaultShell so that "su -l sks" can be used for
manual interaction (that way the files will always have the correct
owner).
    @primeos
    primeos committed Sep 8, 2018
    Copy the full SHA
    eb0050c View commit details
    Browse the repository at this point in the history

  5. nixos/sks: Make the webroot option optional 

    That way the built-in web server is usable by default but users can use
$HOME/web directly (instead of having to use a symlink), if they want to
customize the webpage.
    @primeos
    primeos committed Sep 8, 2018
    Copy the full SHA
    53ef544 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #46370 from primeos/nixos-sks 

    sks,nixos/sks: Various minor improvements

Module:
- Add a webroot option (serve a website by default, makes the setup easier)
- Explicitly set a group (instead of using 65534/nogroup)
- Move pkgs.sks from environment.systemPackages to the "sks" user and add pkgs.db

Package:
- Adapt the output of "sks version" to NixOS
- Copy the example webpages to $webSamples
    @primeos
    primeos committed Sep 8, 2018
    Copy the full SHA
    b58a230 View commit details
    Browse the repository at this point in the history