mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 01:43:15 +00:00
nixos/gitlab: Allow configuration of extra initializers
This adds a configuration option allowing the addition of additional initializers in config/extra-gitlab.rb.
This commit is contained in:
parent
698a3f7edd
commit
f2bdc91b35
@ -160,6 +160,8 @@ let
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extraGitlabRb = pkgs.writeText "extra-gitlab.rb" cfg.extraGitlabRb;
|
||||||
|
|
||||||
smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" ''
|
smtpSettings = pkgs.writeText "gitlab-smtp-settings.rb" ''
|
||||||
if Rails.env.production?
|
if Rails.env.production?
|
||||||
Rails.application.config.action_mailer.delivery_method = :smtp
|
Rails.application.config.action_mailer.delivery_method = :smtp
|
||||||
@ -266,6 +268,26 @@ in {
|
|||||||
description = "Extra configuration in config/database.yml.";
|
description = "Extra configuration in config/database.yml.";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
extraGitlabRb = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "";
|
||||||
|
example = ''
|
||||||
|
if Rails.env.production?
|
||||||
|
Rails.application.config.action_mailer.delivery_method = :sendmail
|
||||||
|
ActionMailer::Base.delivery_method = :sendmail
|
||||||
|
ActionMailer::Base.sendmail_settings = {
|
||||||
|
location: "/run/wrappers/bin/sendmail",
|
||||||
|
arguments: "-i -t"
|
||||||
|
}
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
description = ''
|
||||||
|
Extra configuration to be placed in config/extra-gitlab.rb. This can
|
||||||
|
be used to add configuration not otherwise exposed through this module's
|
||||||
|
options.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
host = mkOption {
|
host = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
default = config.networking.hostName;
|
default = config.networking.hostName;
|
||||||
@ -586,6 +608,7 @@ in {
|
|||||||
[ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
|
[ -L /run/gitlab/uploads ] || ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
|
||||||
cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
|
cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
|
||||||
cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
|
cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
|
||||||
|
ln -sf ${extraGitlabRb} ${cfg.statePath}/config/initializers/extra-gitlab.rb
|
||||||
${optionalString cfg.smtp.enable ''
|
${optionalString cfg.smtp.enable ''
|
||||||
ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
|
ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
|
||||||
''}
|
''}
|
||||||
|
Loading…
Reference in New Issue
Block a user