diff options
| author | Linus Heckemann <git@sphalerite.org> | 2018-11-15 12:13:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 12:13:18 +0100 |
| commit | f73afe6ccff7a7f357438af874aa65a60ea40b91 (patch) | |
| tree | aee461639a8fd2481315485616405bc973d473d1 /nixos | |
| parent | 1ed494367ae5baa649234cd9a725cb8f534a92f3 (diff) | |
| parent | 74df0823f30218e25f2ea7908b98c0c0a93c1e79 (diff) | |
| download | nixlib-f73afe6ccff7a7f357438af874aa65a60ea40b91.tar nixlib-f73afe6ccff7a7f357438af874aa65a60ea40b91.tar.gz nixlib-f73afe6ccff7a7f357438af874aa65a60ea40b91.tar.bz2 nixlib-f73afe6ccff7a7f357438af874aa65a60ea40b91.tar.lz nixlib-f73afe6ccff7a7f357438af874aa65a60ea40b91.tar.xz nixlib-f73afe6ccff7a7f357438af874aa65a60ea40b91.tar.zst nixlib-f73afe6ccff7a7f357438af874aa65a60ea40b91.zip | |
Merge pull request #50356 from mayflower/gitlab-smtp-fix
gitlab: fix smtp setting
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/gitlab.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index aa72cda70453..07adf58c9b26 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -564,11 +564,11 @@ in { [ -L /run/gitlab/log ] || ln -sf ${cfg.statePath}/log /run/gitlab/log [ -L /run/gitlab/tmp ] || ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp [ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads + cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION + cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config ${optionalString cfg.smtp.enable '' ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb ''} - cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION - cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret # JSON is a subset of YAML diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 53675c375e31..661caa8aa832 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -27,6 +27,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : with lib; { enable = true; databasePassword = "dbPassword"; initialRootPassword = "notproduction"; + smtp.enable = true; secrets = { secret = "secret"; otp = "otpsecret"; |