refactor: move around irl stuff

This commit is contained in:
Kat Inskip 2022-07-11 10:46:57 -07:00
parent 854a29af0f
commit 96f9cf36b6
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
3 changed files with 5 additions and 4 deletions

View file

@ -4,7 +4,8 @@
nixos.network nixos.network
services.nginx services.nginx
services.access services.access
] ++ optional (meta.trusted ? services) trusted.services.website; services.irlsite
];
deploy.tf = { deploy.tf = {

View file

@ -25,11 +25,11 @@
dns.records = { dns.records = {
services_inskip_a = { services_inskip_a = {
zone = "inskip.me."; zone = "inskip.me.";
a.address = meta.network.nodes.marisa.network.addresses.public.nixos.ipv4.address; a.address = meta.network.nodes.nixos.marisa.network.addresses.public.nixos.ipv4.address;
}; };
services_inskip_aaaa = { services_inskip_aaaa = {
zone = "inskip.me."; zone = "inskip.me.";
aaaa.address = meta.network.nodes.marisa.network.addresses.public.nixos.ipv6.address; aaaa.address = meta.network.nodes.nixos.marisa.network.addresses.public.nixos.ipv6.address;
}; };
services_gmail_spf = { services_gmail_spf = {
zone = "inskip.me."; zone = "inskip.me.";

View file

@ -3,7 +3,7 @@
{ {
deploy.targets.home = { deploy.targets.home = {
tf = { config, ... }: { tf = { config, ... }: {
imports = optional (builtins.pathExists ../trusted/mail.nix) ../trusted/mail.nix; imports = optional (builtins.pathExists ../services/irlmail.nix) ../services/irlmail.nix;
dns.records.ygg_grimoire = { dns.records.ygg_grimoire = {
zone = "kittywit.ch."; zone = "kittywit.ch.";