diff options
| author | Robin Gloster <mail@glob.in> | 2018-11-14 18:38:55 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-11-14 18:58:45 +0100 |
| commit | 74df0823f30218e25f2ea7908b98c0c0a93c1e79 (patch) | |
| tree | 1fa0b4d45e9279c7861beadac3967ee4eefff722 /nixos | |
| parent | 7ca9d6794896d1b68d28c5b43110312b7f87c266 (diff) | |
| download | nixlib-74df0823f30218e25f2ea7908b98c0c0a93c1e79.tar nixlib-74df0823f30218e25f2ea7908b98c0c0a93c1e79.tar.gz nixlib-74df0823f30218e25f2ea7908b98c0c0a93c1e79.tar.bz2 nixlib-74df0823f30218e25f2ea7908b98c0c0a93c1e79.tar.lz nixlib-74df0823f30218e25f2ea7908b98c0c0a93c1e79.tar.xz nixlib-74df0823f30218e25f2ea7908b98c0c0a93c1e79.tar.zst nixlib-74df0823f30218e25f2ea7908b98c0c0a93c1e79.zip | |
gitlab: fix smtp setting
fixes #50163
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"; |