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: eadeca9ea759
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b648a710afd7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 3, 2019

  1. nixos/gitlab: Fix state directory permissions 

    Since the preStart script is no longer running in privileged mode, we
reassign the files in the state directory and its config subdirectory
to the user we're running as. This is done by splitting the preStart
script into a privileged and an unprivileged part where the privileged
part does the reassignment.

Also, delete the database.yml symlink if it exists, since we want to
create a real file in its place.

Fixes #68696.
    @talyz
    talyz committed Oct 3, 2019
    Copy the full SHA
    0f8133d View commit details
    Browse the repository at this point in the history

  2. nixos/gitlab: Clean up the initializers on start 

    The initializers directory is populated with files from the gitlab
distribution on start, but old files will be left in the state folder
even if they're removed from the distribution, which can lead to
startup failures. Fix this by always purging the directory on start
before populating it.
    @talyz
    talyz committed Oct 3, 2019
    Copy the full SHA
    c6efa9f View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Merge pull request #68721 from talyz/gitlab-fix 

    nixos/gitlab: Fix state directory permissions, clean up initializers directory
    @globin
    globin committed Oct 8, 2019
    Copy the full SHA
    b648a71 View commit details
    Browse the repository at this point in the history