Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge pull request #93424 from helsinki-systems/feat/gitlab-mailroom

nixos/gitlab: Support incoming mail

authored by Florian Klink and committed by GitHub 569fdb2c 8cf4c193

+23
+17
nixos/modules/services/misc/gitlab.nix
··· 783 783 }; 784 784 }; 785 785 786 + systemd.services.gitlab-mailroom = mkIf (gitlabConfig.production.incoming_email.enabled or false) { 787 + description = "GitLab incoming mail daemon"; 788 + after = [ "network.target" "redis.service" "gitlab.service" ]; # gitlab.service creates configs 789 + wantedBy = [ "multi-user.target" ]; 790 + environment = gitlabEnv; 791 + serviceConfig = { 792 + Type = "simple"; 793 + TimeoutSec = "infinity"; 794 + Restart = "on-failure"; 795 + 796 + User = cfg.user; 797 + Group = cfg.group; 798 + ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec mail_room -c ${cfg.packages.gitlab}/share/gitlab/config.dist/mail_room.yml"; 799 + WorkingDirectory = gitlabEnv.HOME; 800 + }; 801 + }; 802 + 786 803 systemd.services.gitlab = { 787 804 after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "gitlab-postgresql.service" "redis.service" ]; 788 805 requires = [ "gitlab-sidekiq.service" ];
+6
nixos/modules/services/misc/gitlab.xml
··· 98 98 </para> 99 99 100 100 <para> 101 + When <literal>icoming_mail.enabled</literal> is set to <literal>true</literal> 102 + in <link linkend="opt-services.gitlab.extraConfig">extraConfig</link> an additional 103 + service called <literal>gitlab-mailroom</literal> is enabled for fetching incoming mail. 104 + </para> 105 + 106 + <para> 101 107 Refer to <xref linkend="ch-options" /> for all available configuration 102 108 options for the 103 109 <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.