diff options
author | talyz <kim.lindberger@gmail.com> | 2023-01-09 18:08:31 +0100 |
---|---|---|
committer | talyz <kim.lindberger@gmail.com> | 2023-01-17 17:33:47 +0100 |
commit | dbd563b9b8c20071075bcdd5912b99486b3fcfa3 (patch) | |
tree | 6ec38ae9211686145204ac8501d883fe80a71fab /nixos/tests/gitlab.nix | |
parent | e7383a32e365371b9d62c30f16089687db7cb5d4 (diff) |
nixos/gitlab: Improve support for GitLab Pages
- provide options and set defaults for important settings - generate the shared secret - reenable gitlab-pages in test
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 d9d75d1cbd89b..0b3d321fbbdfe 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") |