diff --git a/build01/configuration.nix b/build01/configuration.nix index 8afe57b..bae46ba 100644 --- a/build01/configuration.nix +++ b/build01/configuration.nix @@ -40,6 +40,14 @@ networking.nix-community.ipv6.address = "2a01:4f8:13b:2ceb::1"; + services.nginx.virtualHosts = { + "hydra.nix-community.org" = { + forceSSL = true; + enableACME = true; + locations."/".proxyPass = "http://localhost:${toString (config.services.hydra.port)}"; + }; + }; + systemd.services.healthcheck-ping = { startAt = "*:0/5"; # every 5 minutes serviceConfig.ExecStart = "${pkgs.curl}/bin/curl -X POST -sfL https://hc-ping.com/fcf6c029-5b57-44aa-b392-923f3d894dd9"; diff --git a/build03/configuration.nix b/build03/configuration.nix index e587470..452596b 100644 --- a/build03/configuration.nix +++ b/build03/configuration.nix @@ -19,6 +19,7 @@ ../roles/nix-community-cache.nix ../services/hound + ../services/hydra ../services/matterbridge.nix ]; @@ -31,6 +32,13 @@ insmod mdraid1x ''; + services.nginx.virtualHosts = { + "hydra2.nix-community.org" = { + forceSSL = true; + enableACME = true; + locations."/".proxyPass = "http://localhost:${toString (config.services.hydra.port)}"; + }; + }; networking.nix-community.ipv6.address = "2a01:4f9:3a:3b16::1"; networking.hostName = "nix-community-build03"; diff --git a/services/hydra/default.nix b/services/hydra/default.nix index a6da5a6..0fab964 100644 --- a/services/hydra/default.nix +++ b/services/hydra/default.nix @@ -89,13 +89,13 @@ in ]; }; - services.nginx.virtualHosts = { - "hydra.nix-community.org" = { - forceSSL = true; - enableACME = true; - locations."/".proxyPass = "http://localhost:${toString (hydraPort)}"; - }; - }; + #services.nginx.virtualHosts = { + # "hydra.nix-community.org" = { + # forceSSL = true; + # enableACME = true; + # locations."/".proxyPass = "http://localhost:${toString (hydraPort)}"; + # }; + #}; services.hydra = { enable = true; diff --git a/terraform/cloudflare_nix-community_org.tf b/terraform/cloudflare_nix-community_org.tf index aca8053..9f4a09d 100644 --- a/terraform/cloudflare_nix-community_org.tf +++ b/terraform/cloudflare_nix-community_org.tf @@ -59,6 +59,13 @@ resource "cloudflare_record" "nix-community-org-hydra-CNAME" { type = "CNAME" } +resource "cloudflare_record" "nix-community-org-hydra2-CNAME" { + zone_id = local.nix_community_org_zone_id + name = "hydra2" + value = "build03.nix-community.org" + type = "CNAME" +} + resource "cloudflare_record" "nix-community-org-search-CNAME" { zone_id = local.nix_community_org_zone_id name = "search"