git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #50356 from mayflower/gitlab-smtp-fix

gitlab: fix smtp setting

commitf73afe6ccff7a7f357438af874aa65a60ea40b91 authorLinus Heckemann <git@sphalerite.org> dateThu 15 Nov 2018, 12:13 (8 years ago) parent1ed494374df082
2 files changed+3−2
nixos/modules/services/misc/gitlab.nix+2−2 nixos/tests/gitlab.nix+1
nixos/modules/services/misc/gitlab.nix+2−2
@@ -564,11 +564,11 @@ in {
564564 [ -L /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log
565565 [ -L /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
566566 [ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
567+ cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
568+ cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
567569 ${optionalString cfg.smtp.enable ''
568570 ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
569571 ''}
570− cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
571− cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
572572 ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
573573
574574 # JSON is a subset of YAML
nixos/tests/gitlab.nix+1
@@ -27,6 +27,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; {
2727 enable = true;
2828 databasePassword = "dbPassword";
2929 initialRootPassword = "notproduction";
30+ smtp.enable = true;
3031 secrets = {
3132 secret = "secret";
3233 otp = "otpsecret";