git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/gitlab: Fix extra-gitlab.rb

Line 794 removes the entire directory, rendering the tmpfiles rule useless. cc @bgamari @talyz

commit25bad1f9b814e18bfbb90d9fa4a5ced88647f67d authorJanne Heß <janne@hess.ooo> dateFri 17 Jul 2020, 19:34 (6 years ago) parent3115fe6
1 file changed+1−1
nixos/modules/services/misc/gitlab.nix+1−1
nixos/modules/services/misc/gitlab.nix+1−1
@@ -678,7 +678,6 @@ in {
678678 "L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}"
679679
680680 "L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}"
681− "L+ ${cfg.statePath}/config/initializers/extra-gitlab.rb - - - - ${extraGitlabRb}"
682681 ];
683682
684683 systemd.services.gitlab-sidekiq = {
@@ -798,6 +797,7 @@ in {
798797 rm -f ${cfg.statePath}/lib
799798 cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
800799 cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
800+ ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
801801
802802 ${cfg.packages.gitlab-shell}/bin/install
803803