nixos/tests/gitlab.nix: Unbreak config, still times out

authored by

Sarah Brofeldt and committed by
Robin Gloster
294bb6da 2767a0e9

+51 -3
+51 -3
nixos/tests/gitlab.nix
··· 9 9 nodes = { 10 10 gitlab = { config, pkgs, ... }: { 11 11 virtualisation.memorySize = 768; 12 - services.gitlab.enable = true; 13 - services.gitlab.databasePassword = "gitlab"; 12 + 13 + services.nginx = { 14 + enable = true; 15 + virtualHosts = { 16 + "localhost" = { 17 + locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; 18 + }; 19 + }; 20 + }; 21 + 14 22 systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min"; 23 + services.gitlab = { 24 + enable = true; 25 + databasePassword = "dbPassword"; 26 + secrets = { 27 + secret = "secret"; 28 + otp = "otpsecret"; 29 + db = "dbsecret"; 30 + 31 + # nix-shell -p openssl --run "openssl genrsa 2048" 32 + jws = '' 33 + -----BEGIN RSA PRIVATE KEY----- 34 + MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21 35 + PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+ 36 + Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX 37 + z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k 38 + 7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY 39 + 0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5 40 + qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3 41 + lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM 42 + AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR 43 + cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O 44 + bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac 45 + +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp 46 + kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8 47 + vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7 48 + sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS 49 + qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr 50 + 7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W 51 + 3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+ 52 + vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK 53 + fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX 54 + 12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM 55 + f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L 56 + rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m 57 + VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW 58 + 3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw== 59 + -----END RSA PRIVATE KEY----- 60 + ''; 61 + }; 62 + }; 15 63 }; 16 64 }; 17 65 ··· 19 67 $gitlab->start(); 20 68 $gitlab->waitForUnit("gitlab.service"); 21 69 $gitlab->waitForUnit("gitlab-sidekiq.service"); 22 - $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in"); 70 + $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in"); 23 71 ''; 24 72 })