gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules/nixos: Fix bug, services/website: Building fix

Browse source
This commit is contained in:
kat witch 2021-12-26 19:32:31 +00:00 • committed by kat
parent bcfd2b3413
commit bd3900f52b
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config/modules/nixos/network.nix
View file

@ -179,11 +179,14 @@ in
};
networking = {
networking = mkMerge [{
domain = mkDefault (if cfg.addresses.public.enable then cfg.dns.domain
else if cfg.addresses.private.enable then "${cfg.addresses.private.prefix}.${cfg.dns.domain}" else "");
}
(mkIf cfg.addresses.private.enable {
defaultGateway = mkDefault cfg.privateGateway;
};
})
];
deploy.tf.dns.records =
let

2
config/services/website.nix
View file

@ -5,7 +5,7 @@
services.nginx.virtualHosts = {
"${config.network.dns.domain}" = {
#root = pkgs.kittywitch-site;
root = pkgs.kittywitch-site;
enableACME = true;
forceSSL = true;
};

2
config/tf

@ -1 +1 @@
Subproject commit d1a8b226aa046cca35abede281c61159aebc58e2
Subproject commit 5940763767ab723f39806dd61d21fb82975c4bb8