sid/sid.ovh
1
0
Fork 0
Code Issues 3 Pull requests 2 Projects Releases Packages Wiki Activity Actions

use public domain for internal services via intra subdomain #14

Merged
sid merged 6 commits from develop into master 2026-04-03 15:57:36 +02:00
Conversation 0 Commits 6 Files changed 5 +8 -21
3 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit de754b0033 - Show all commits

9
constants.nix
View file

@ -3,15 +3,12 @@ rec {
hosts = { hosts = {
sid = { sid = {
ip = "100.64.0.6"; ip = "100.64.0.6";
domain = "sid.tail";
}; };
rx4 = { rx4 = {
ip = "100.64.0.10"; ip = "100.64.0.10";
domain = "rx4.tail";
}; };
vde = { vde = {
ip = "100.64.0.1"; ip = "100.64.0.1";
domain = "vde.tail";
}; };
}; };
services = { services = {
@ -27,7 +24,7 @@ rec {
port = 8085; port = 8085;
}; };
netdata = { netdata = {
fqdn = "netdata.sid.tail"; fqdn = "netdata.intra." + domain;
port = 19999; port = 19999;
}; };
open-webui-oci = { open-webui-oci = {
@ -43,11 +40,11 @@ rec {
port = 1200; port = 1200;
}; };
vaultwarden = { vaultwarden = {
fqdn = "pw.rx4.tail"; fqdn = "pw.intra." + domain;
port = 8222; port = 8222;
}; };
webdav = { webdav = {
fqdn = "dav.rx4.tail"; fqdn = "dav.intra." + domain;
port = 8080; port = 8080;
}; };
}; };

18
hosts/sid/services/headscale.nix
View file

@ -21,11 +21,10 @@
.:53 { .:53 {
bind ${hosts.sid.ip} bind ${hosts.sid.ip}
hosts { hosts {
${hosts.sid.ip} sid.tail ${hosts.rx4.ip} ${services.vaultwarden.fqdn}
${hosts.sid.ip} netdata.sid.tail ${hosts.rx4.ip} ${services.webdav.fqdn}
${hosts.rx4.ip} rx4.tail ${hosts.rx4.ip} rx4.tail
${hosts.rx4.ip} dav.rx4.tail ${hosts.sid.ip} sid.tail
${hosts.rx4.ip} pw.rx4.tail
${hosts.vde.ip} vde.tail ${hosts.vde.ip} vde.tail
fallthrough fallthrough
} }
@ -54,16 +53,7 @@
}; };
settings = { settings = {
dns = { dns = {
magic_dns = true; magic_dns = true; # NOTE: should coredns handle everything?
base_domain = "tail";
search_domains = [ "tail" ];
override_local_dns = true;
nameservers = {
global = [ "1.1.1.1" ];
split = {
"tail" = [ constants.hosts.sid.ip ];
};
};
}; };
}; };
}; };

2
hosts/sid/services/nginx.nix
View file

@ -35,7 +35,7 @@ in
port = constants.services.miniflux.port; port = constants.services.miniflux.port;
}; };
virtualHosts."${constants.services.netdata.fqdn}" = mkVirtualHost { virtualHosts."${constants.services.netdata.fqdn}" = mkVirtualHost {
ssl = false; inherit ssl;
port = constants.services.netdata.port; port = constants.services.netdata.port;
}; };
virtualHosts."${constants.services.open-webui-oci.fqdn}" = mkVirtualHost { virtualHosts."${constants.services.open-webui-oci.fqdn}" = mkVirtualHost {