diff options
| author | talyz <kim.lindberger@gmail.com> | 2021-08-26 17:45:01 +0200 |
|---|---|---|
| committer | talyz <kim.lindberger@gmail.com> | 2021-08-26 19:01:22 +0200 |
| commit | 99387372d5af951fa7ab1cad970b7bef83b6b91c (patch) | |
| tree | 4b230407e53038ae5b23a7a31b2bb1c5fd0b5298 /nixos | |
| parent | eada59b86b4925db45e705a6058eaca92485e939 (diff) | |
| download | nixpkgs-99387372d5af951fa7ab1cad970b7bef83b6b91c.tar nixpkgs-99387372d5af951fa7ab1cad970b7bef83b6b91c.tar.gz nixpkgs-99387372d5af951fa7ab1cad970b7bef83b6b91c.tar.bz2 nixpkgs-99387372d5af951fa7ab1cad970b7bef83b6b91c.tar.lz nixpkgs-99387372d5af951fa7ab1cad970b7bef83b6b91c.tar.xz nixpkgs-99387372d5af951fa7ab1cad970b7bef83b6b91c.tar.zst nixpkgs-99387372d5af951fa7ab1cad970b7bef83b6b91c.zip | |
gitlab: 14.1.2 -> 14.2.1
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/gitlab.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1514cc0665d..dbcf531a69c 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -117,6 +117,7 @@ let shared.path = "${cfg.statePath}/shared"; gitaly.client_path = "${cfg.packages.gitaly}/bin"; backup = { + gitaly_backup_path = "${cfg.packages.gitaly}/bin/gitaly-backup"; path = cfg.backup.path; keep_time = cfg.backup.keepTime; } // (optionalAttrs (cfg.backup.uploadOptions != {}) { @@ -1299,7 +1300,7 @@ in { Restart = "on-failure"; WorkingDirectory = gitlabEnv.HOME; ExecStart = - "${cfg.packages.gitlab-workhorse}/bin/gitlab-workhorse " + "${cfg.packages.gitlab-workhorse}/bin/workhorse " + "-listenUmask 0 " + "-listenNetwork unix " + "-listenAddr /run/gitlab/gitlab-workhorse.socket " diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index fc153bb06ec..3e9feeb0769 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -145,7 +145,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { ) gitlab.succeed("systemd-tmpfiles --create") gitlab.succeed("rm -rf ${nodes.gitlab.config.services.postgresql.dataDir}") - gitlab.systemctl("start gitlab-config.service gitlab-postgresql.service") + gitlab.systemctl("start gitlab-config.service gitaly.service gitlab-postgresql.service") + gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitaly.socket") gitlab.succeed( "sudo -u gitlab -H gitlab-rake gitlab:backup:restore RAILS_ENV=production BACKUP=dump force=yes" ) |