diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-03-10 18:46:21 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-03-10 18:46:21 +0000 |
| commit | 8c70bfb9f2bc1373f934ea56de96eb7ea762f349 (patch) | |
| tree | 8e7371704c17bed1d64a2a1045bd85dbedc7edaa /nixos/tests | |
| parent | d562454bfd795e8071b45738c2c739372fece481 (diff) | |
| parent | 4a0377b56ad94c807874bfda8a164299534d5d62 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/libraries/librsvg/default.nix pkgs/development/python-modules/r2pipe/default.nix
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/gitlab.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 59dbc99052a60..c2a11bada0a35 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -69,6 +69,10 @@ in { databasePasswordFile = pkgs.writeText "dbPassword" "xo0daiF4"; initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword; smtp.enable = true; + pages = { + enable = true; + settings.pages-domain = "localhost"; + }; extraConfig = { incoming_email = { enabled = true; @@ -79,11 +83,6 @@ in { host = "localhost"; port = 143; }; - # https://github.com/NixOS/nixpkgs/issues/132295 - # pages = { - # enabled = true; - # host = "localhost"; - # }; }; secrets = { secretFile = pkgs.writeText "secret" "Aig5zaic"; @@ -171,10 +170,9 @@ in { waitForServices = '' gitlab.wait_for_unit("gitaly.service") gitlab.wait_for_unit("gitlab-workhorse.service") - # https://github.com/NixOS/nixpkgs/issues/132295 - # gitlab.wait_for_unit("gitlab-pages.service") gitlab.wait_for_unit("gitlab-mailroom.service") gitlab.wait_for_unit("gitlab.service") + gitlab.wait_for_unit("gitlab-pages.service") gitlab.wait_for_unit("gitlab-sidekiq.service") gitlab.wait_for_file("${nodes.gitlab.config.services.gitlab.statePath}/tmp/sockets/gitlab.socket") gitlab.wait_until_succeeds("curl -sSf http://gitlab/users/sign_in") |