sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move hydra to build03

Browse source
This commit is contained in:
Jörg Thalheim 2021-04-21 23:23:08 +02:00
parent 5ce498b619
commit 791ea9338a
No known key found for this signature in database
GPG key ID: B3F5D81B0C6967C4
5 changed files with 8 additions and 45 deletions

12
build01/configuration.nix
View file

@ -14,12 +14,8 @@
./hardware-configuration.nix ./hardware-configuration.nix
../roles/common.nix ../roles/common.nix
../roles/docker.nix
../roles/hetzner-network.nix ../roles/hetzner-network.nix
../roles/nginx.nix
../roles/nix-community-cache.nix
../services/hydra
../services/marvin-mk2.nix ../services/marvin-mk2.nix
]; ];
@ -40,14 +36,6 @@
networking.nix-community.ipv6.address = "2a01:4f8:13b:2ceb::1"; 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 = { systemd.services.healthcheck-ping = {
startAt = "*:0/5"; # every 5 minutes startAt = "*:0/5"; # every 5 minutes
serviceConfig.ExecStart = "${pkgs.curl}/bin/curl -X POST -sfL https://hc-ping.com/fcf6c029-5b57-44aa-b392-923f3d894dd9"; serviceConfig.ExecStart = "${pkgs.curl}/bin/curl -X POST -sfL https://hc-ping.com/fcf6c029-5b57-44aa-b392-923f3d894dd9";

7
build03/configuration.nix
View file

@ -32,13 +32,6 @@
insmod mdraid1x 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.nix-community.ipv6.address = "2a01:4f9:3a:3b16::1";
networking.hostName = "nix-community-build03"; networking.hostName = "nix-community-build03";

19
deployment.nix
View file

@ -52,25 +52,6 @@ in
group = "marvin-mk2"; group = "marvin-mk2";
permissions = "0600"; permissions = "0600";
}; };
deployment.keys."nix-community-cachix.dhall" = {
text = secrets."nix-community-cachix.dhall";
destDir = "/var/lib/post-build-hook";
user = "root";
permissions = "0400";
};
deployment.keys.hydra-admin-password = {
text = secrets.hydra-admin-password;
user = "hydra";
permissions = "0400";
};
deployment.keys.hydra-users = {
text = secrets.hydra-users;
user = "hydra";
permissions = "0400";
};
}; };
build02 = build02 =

8
services/hydra/default.nix
View file

@ -134,6 +134,14 @@ in
]; ];
}; };
services.nginx.virtualHosts = {
"hydra.nix-community.org" = {
forceSSL = true;
enableACME = true;
locations."/".proxyPass = "http://localhost:${toString (config.services.hydra.port)}";
};
};
# Create a admin user and configure a declarative project # Create a admin user and configure a declarative project
systemd.services.hydra-post-init = { systemd.services.hydra-post-init = {
serviceConfig = { serviceConfig = {

7
terraform/cloudflare_nix-community_org.tf
View file

@ -55,13 +55,6 @@ resource "cloudflare_record" "nix-community-org-docker-CNAME" {
resource "cloudflare_record" "nix-community-org-hydra-CNAME" { resource "cloudflare_record" "nix-community-org-hydra-CNAME" {
zone_id = local.nix_community_org_zone_id zone_id = local.nix_community_org_zone_id
name = "hydra" name = "hydra"
value = "build01.nix-community.org"
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" value = "build03.nix-community.org"
type = "CNAME" type = "CNAME"
} }