git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93358 from helsinki-systems/fix/gitlab-customrb

nixos/gitlab: Fix extra-gitlab.rb

commitb7be00ad5ed0cdbba73fa7fd7fadcb842831f137 authorFlorian Klink <flokli@flokli.de> dateSat 15 Aug 2020, 20:13 (6 years ago) parent10d873825bad1f
1 file changed+1−1
nixos/modules/services/misc/gitlab.nix+1−1
nixos/modules/services/misc/gitlab.nix+1−1
@@ -696,7 +696,6 @@ in {
696696 "L+ /run/gitlab/shell-config.yml - - - - ${pkgs.writeText "config.yml" (builtins.toJSON gitlabShellConfig)}"
697697
698698 "L+ ${cfg.statePath}/config/unicorn.rb - - - - ${./defaultUnicornConfig.rb}"
699− "L+ ${cfg.statePath}/config/initializers/extra-gitlab.rb - - - - ${extraGitlabRb}"
700699 ];
701700
702701 systemd.services.gitlab-sidekiq = {
@@ -816,6 +815,7 @@ in {
816815 rm -f ${cfg.statePath}/lib
817816 cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
818817 cp -rf --no-preserve=mode ${cfg.packages.gitlab}/share/gitlab/db/* ${cfg.statePath}/db
818+ ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
819819
820820 ${cfg.packages.gitlab-shell}/bin/install
821821