diff options
| author | talyz <kim.lindberger@gmail.com> | 2019-10-19 16:36:24 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2019-10-19 19:30:28 +0200 |
| commit | ed4a09c6f362bdbb1a25d16078dde7580c933663 (patch) | |
| tree | 838c61f0e9fd964fbeb0ac1a8c036cb3717ea863 /nixos/modules/services | |
| parent | 5617886b16ccf0b5e9bf6c7f93d79162cc14fad3 (diff) | |
| download | nixlib-ed4a09c6f362bdbb1a25d16078dde7580c933663.tar nixlib-ed4a09c6f362bdbb1a25d16078dde7580c933663.tar.gz nixlib-ed4a09c6f362bdbb1a25d16078dde7580c933663.tar.bz2 nixlib-ed4a09c6f362bdbb1a25d16078dde7580c933663.tar.lz nixlib-ed4a09c6f362bdbb1a25d16078dde7580c933663.tar.xz nixlib-ed4a09c6f362bdbb1a25d16078dde7580c933663.tar.zst nixlib-ed4a09c6f362bdbb1a25d16078dde7580c933663.zip | |
gitlab: Get rid of most 'already initialized constant'-warnings
On start, unicorn, sidekiq and other parts running ruby code emits quite a few warnings similar to /var/gitlab/state/config/application.rb:202: warning: already initialized constant Gitlab::Application::LOOSE_EE_APP_ASSETS /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/config/application.rb:202: warning: previous definition of LOOSE_EE_APP_ASSETS was here /var/gitlab/state/lib/gitlab.rb:38: warning: already initialized constant Gitlab::COM_URL /nix/store/ysb0lgbzxp7a9y4yl8d4f9wrrzy9kafc-gitlab-ee-12.3.5/share/gitlab/lib/gitlab.rb:38: warning: previous definition of COM_URL was here This seems to be caused by the same ruby files being evaluated multiple times due to the paths being different - sometimes they're loaded using the direct path and sometimes through a symlink, due to our split between config and package data. To fix this, we make sure that the offending files in the state directory always reference the store path, regardless of that being the real file or a symlink.
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 20b87af23a5a..f5d37172a101 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -666,7 +666,6 @@ in { "d ${gitlabConfig.production.shared.path}/artifacts 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/lfs-objects 0750 ${cfg.user} ${cfg.group} -" "d ${gitlabConfig.production.shared.path}/pages 0750 ${cfg.user} ${cfg.group} -" - "L+ ${cfg.statePath}/lib - - - - ${cfg.packages.gitlab}/share/gitlab/lib" "L+ /run/gitlab/config - - - - ${cfg.statePath}/config" "L+ /run/gitlab/log - - - - ${cfg.statePath}/log" "L+ /run/gitlab/tmp - - - - ${cfg.statePath}/tmp" |