mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(ops/nixos/camden): Merge ACME certificate blocks

Browse source
This commit is contained in:
Vincent Ambo 2020-02-14 12:00:12 +00:00
parent bcc797fa2f
commit 2fd6ec650b
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ops/nixos/camden/default.nix
View file

@ -145,16 +145,6 @@ in pkgs.lib.fix(self: {
# Provision a TLS certificate outside of nginx to avoid
# nixpkgs#38144
security.acme.certs."camden.tazj.in" = {
user = "nginx";
group = "nginx";
webroot = "/var/lib/acme/acme-challenge";
extraDomains = {
"git.camden.tazj.in" = null;
};
postRun = "systemctl reload nginx";
};
security.acme.certs."tazj.in" = {
user = "nginx";
group = "nginx";
@ -162,6 +152,10 @@ in pkgs.lib.fix(self: {
extraDomains = {
"git.tazj.in" = null;
"www.tazj.in" = null;
# Local domains (for this machine only)
"camden.tazj.in" = null;
"git.camden.tazj.in" = null;
};
postRun = "systemctl reload nginx";
};
@ -193,7 +187,8 @@ in pkgs.lib.fix(self: {
'';
virtualHosts.homepage = {
serverName = "tazj.in"; # TODO(tazjin): change to actual host later
serverName = "tazj.in";
serverAliases = [ "camden.tazj.in" ];
default = true;
useACMEHost = "tazj.in";
root = pkgs.web.homepage;
@ -224,6 +219,7 @@ in pkgs.lib.fix(self: {
virtualHosts.cgit = {
serverName = "git.tazj.in";
serverAliases = [ "git.camden.tazj.in" ];
useACMEHost = "tazj.in";
addSSL = true;