diff options
| author | Yureka <yuka@yuka.dev> | 2023-03-10 14:36:25 +0100 |
|---|---|---|
| committer | Yureka <yuka@yuka.dev> | 2023-03-10 14:36:25 +0100 |
| commit | 7efee351ec94a016e516d9d38d82791ca2522598 (patch) | |
| tree | db99e3141d64b4bc8bd6a3f48bc8b2e3c4c277cd /nixos/tests/gitlab.nix | |
| parent | 975e73668fd4da354b84f3b59ef46bc4e75216c0 (diff) | |
| parent | 2d4f4e9bdfdcc69ea19299150db5c26c7aa4e44a (diff) | |
Merge branch 'gitlab-pages' of github.com:talyz/nixpkgs into HEAD
Diffstat (limited to 'nixos/tests/gitlab.nix')
| -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") |