diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 0d18f4b4398..7ce5a25206b 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1247,9 +1247,8 @@ in { procps gnupg ]; - serviceConfig = { - Type = "simple"; + Type = "notify"; User = cfg.user; Group = cfg.group; TimeoutSec = "infinity"; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 09122887efb..ff806aa1ad7 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -534,3 +534,5 @@ gem 'webauthn', '~> 2.3' gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' + +gem 'sd_notify' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 45fbaf778b1..f43f8610196 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1160,6 +1160,7 @@ GEM addressable (>= 2.3.5) faraday (> 0.8, < 2.0) scientist (1.6.0) + sd_notify (0.1.1) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1611,6 +1612,7 @@ DEPENDENCIES rugged (~> 1.1) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) + sd_notify seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) sentry-raven (~> 3.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 4d4e9292d39..84c1222dbbc 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -4925,6 +4925,16 @@ }; version = "1.6.0"; }; + sd_notify = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0c9imnjbakx25r2n7widfp00s19ndzmmwax761mx5vbwm9nariyb"; + type = "gem"; + }; + version = "0.1.1"; + }; securecompare = { groups = ["default"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 301589c532f..b644f59f780 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -135,6 +135,7 @@ def update_rubyenv(): f.write(repo.get_file('Gemfile.lock', rev)) with open(rubyenv_dir / 'Gemfile', 'w') as f: original = repo.get_file('Gemfile', rev) + original += "\ngem 'sd_notify'\n" f.write(re.sub(r".*mail-smtp_pool.*", "", original)) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir)