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: 493e51deadfd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2f3b9cd52cf5
Choose a head ref
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 6, 2019

  1. nixos/gitlab: Fix missing ca_file for SMTP

    Work around upstream issue #790 by explicitly referencing the
    ca-certificates.crt file.
    talyz committed Sep 6, 2019
    Copy the full SHA
    7648b4f View commit details
    Browse the repository at this point in the history
  2. nixos/gitlab: Add support for storing secrets in files

    Add support for storing secrets in files outside the nix store, since
    files in the nix store are world-readable and secrets therefore can't
    be stored safely there.
    
    The old string options are kept, since they can potentially be handy
    for testing purposes, but their descriptions now state that they
    shouldn't be used in production. The manual section is updated to use
    the file options rather than the string options and the tests now test
    both.
    talyz committed Sep 6, 2019
    Copy the full SHA
    cbdf94c View commit details
    Browse the repository at this point in the history
  3. nixos/gitlab: Use postgresql module options to provision local db

    Use the postgresql module to provision a local db (if
    databaseCreateLocally is true) instead of doing this locally.
    
    Switch to using the local unix socket for db connections by default;
    this is needed since dbs created by the postgresql module only support
    peer authentication.
    
    Instead of running the rake tasks db:schema:load, db:migrate and
    db:seed_fu, run gitlab:db:configure, which in turn runs these tasks
    when needed.
    
    Solves issue #53852 for gitlab.
    talyz committed Sep 6, 2019
    Copy the full SHA
    b351454 View commit details
    Browse the repository at this point in the history
  4. nixos/utils: Handle arbitrary secrets in JSON output files

    Introduce new functions which allows modules to define options where,
    if the input is an attrset and the output is JSON, the user can define
    arbitrary secrets.
    talyz committed Sep 6, 2019
    Copy the full SHA
    64358cb View commit details
    Browse the repository at this point in the history
  5. nixos/gitlab: Extract arbitrary secrets from extraConfig

    Adds the ability to make any parameter specified in extraConfig secret
    by defining it an attrset containing the attr _secret, which in turn
    is a path to a file containing the actual secret.
    talyz committed Sep 6, 2019
    Copy the full SHA
    240649a View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Merge pull request #66274 from talyz/gitlab

    nixos/gitlab: Add support for secure secrets and more
    flokli committed Sep 7, 2019
    Copy the full SHA
    2f3b9cd View commit details
    Browse the repository at this point in the history