lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

depotwide: add google-cloudflare role

Browse source
This commit is contained in:
Luke Granger-Brown 2022-08-10 01:51:46 +01:00
parent 94743c8fa2
commit 5c1742e13f
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/pkgs/vault-acme/default.nix
View file

@ -15,8 +15,8 @@ buildGoModule rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lukegb"; owner = "lukegb";
repo = pname; repo = pname;
rev = "c93a5466c09e2198483928e4931e31f2a3cee753"; rev = "d128cded9a4f96b0c6784f13c6ff6d077f6688da";
sha256 = "sha256:1yik8vx4d9c8qcxrrab0j1vxzcs1qnfgpi62n6rqv2sy19k0kybz"; sha256 = "sha256:0yp8nmzp0cfqxh0r6qls0mwz9myaskb3q5qwcwx6gcm2wrwidi84";
}; };
patches = [ ./just-add-a-sleep.patch ]; patches = [ ./just-add-a-sleep.patch ];

2
ops/nixos/lib/secretsmgr-acme.nix
View file

@ -51,7 +51,7 @@ in
role = mkOption { role = mkOption {
type = str; type = str;
default = "letsencrypt-cloudflare"; default = "google-cloudflare";
description = "Which role to use for certificate issuance."; description = "Which role to use for certificate issuance.";
}; };

2
ops/nixos/totoro/default.nix
View file

@ -506,7 +506,7 @@ in {
ExecStart = "${depot.ops.raritan.ssl-renew}/lego.sh"; ExecStart = "${depot.ops.raritan.ssl-renew}/lego.sh";
EnvironmentFile = pkgs.writeText "sslrenew-secret" '' EnvironmentFile = pkgs.writeText "sslrenew-secret" ''
CERTIFICATE_DOMAIN=kvm.lukegb.xyz CERTIFICATE_DOMAIN=kvm.lukegb.xyz
CERTIFICATE_ROLE=letsencrypt-cloudflare CERTIFICATE_ROLE=google-cloudflare
RARITAN_IP=192.168.1.50 RARITAN_IP=192.168.1.50
RARITAN_USERNAME=${secrets.raritan.sslrenew.username} RARITAN_USERNAME=${secrets.raritan.sslrenew.username}
RARITAN_PASSWORD=${secrets.raritan.sslrenew.password} RARITAN_PASSWORD=${secrets.raritan.sslrenew.password}

2
ops/vault/cfg/acme-ca.nix
View file

@ -44,5 +44,7 @@
letsencrypt-gcloud-as205479.allowed_domains = gcloudDomains; letsencrypt-gcloud-as205479.allowed_domains = gcloudDomains;
letsencrypt-staging-gcloud-as205479.allowed_domains = gcloudDomains; letsencrypt-staging-gcloud-as205479.allowed_domains = gcloudDomains;
google-cloudflare.allowed_domains = cloudflareDomains;
}; };
} }