diff options
author | tomberek <tomberek@users.noreply.github.com> | 2022-02-12 16:35:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-12 16:35:28 -0500 |
commit | 97ba711edbe5ed64b5e22c3ada6d521f44d4399f (patch) | |
tree | 867969340dda272013efead96674c24609529f42 /nixos | |
parent | e8d0ffa08ca1ee49733bbb24848a10e1d722ea02 (diff) | |
parent | 0f5d59ee5a33999525569b4059403c3e6eccf6ee (diff) | |
download | nixpkgs-97ba711edbe5ed64b5e22c3ada6d521f44d4399f.tar nixpkgs-97ba711edbe5ed64b5e22c3ada6d521f44d4399f.tar.gz nixpkgs-97ba711edbe5ed64b5e22c3ada6d521f44d4399f.tar.bz2 nixpkgs-97ba711edbe5ed64b5e22c3ada6d521f44d4399f.tar.lz nixpkgs-97ba711edbe5ed64b5e22c3ada6d521f44d4399f.tar.xz nixpkgs-97ba711edbe5ed64b5e22c3ada6d521f44d4399f.tar.zst nixpkgs-97ba711edbe5ed64b5e22c3ada6d521f44d4399f.zip |
Merge pull request #159438 from ju1m/sourcehut
sourcehut: fix and update
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/tests/sourcehut.nix | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/nixos/tests/sourcehut.nix b/nixos/tests/sourcehut.nix index d1536c59322..55757e35f9b 100644 --- a/nixos/tests/sourcehut.nix +++ b/nixos/tests/sourcehut.nix @@ -125,13 +125,18 @@ in virtualisation.memorySize = 2 * 1024; networking.domain = domain; networking.extraHosts = '' - ${config.networking.primaryIPAddress} meta.${domain} ${config.networking.primaryIPAddress} builds.${domain} + ${config.networking.primaryIPAddress} git.${domain} + ${config.networking.primaryIPAddress} meta.${domain} ''; services.sourcehut = { enable = true; - services = [ "meta" "builds" ]; + services = [ + "builds" + "git" + "meta" + ]; nginx.enable = true; nginx.virtualHost = { forceSSL = true; @@ -148,6 +153,8 @@ in #enableWorker = true; inherit images; }; + git.enable = true; + settings."sr.ht" = { global-domain = config.networking.domain; service-key = pkgs.writeText "service-key" "8b327279b77e32a3620e2fc9aabce491cc46e7d821fd6713b2a2e650ce114d01"; @@ -157,6 +164,10 @@ in oauth-client-secret = pkgs.writeText "buildsrht-oauth-client-secret" "2260e9c4d9b8dcedcef642860e0504bc"; oauth-client-id = "299db9f9c2013170"; }; + settings."git.sr.ht" = { + oauth-client-secret = pkgs.writeText "gitsrht-oauth-client-secret" "3597288dc2c716e567db5384f493b09d"; + oauth-client-id = "d07cb713d920702e"; + }; settings.webhooks.private-key = pkgs.writeText "webhook-key" "Ra3IjxgFiwG9jxgp4WALQIZw/BMYt30xWiOsqD0J7EA="; }; @@ -193,5 +204,9 @@ in machine.wait_for_open_port(5002) machine.succeed("curl -sL http://localhost:5002 | grep builds.${domain}") #machine.wait_for_unit("buildsrht-worker.service") + + # Testing gitsrht + machine.wait_for_unit("gitsrht.service") + machine.succeed("curl -sL http://git.${domain} | grep git.${domain}") ''; }) |