opdavies/nix-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refactor homelab ports
All checks were successful
/ check (push) Successful in 38s
Details

Browse source 
Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>
This commit is contained in:
Oliver Davies 2025-11-05 00:27:05 +00:00
parent 239fb86c5d
commit fa38f26bb1
8 changed files with 35 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/nixedo/modules/containers/pi-hole.nix
View file

@ -2,7 +2,7 @@
let let
service = "pihole"; service = "pihole";
port = config.homelab.ports.${service}; port = config.homelab.ports.services.${service};
in in
{ {
virtualisation.oci-containers.containers.${service} = { virtualisation.oci-containers.containers.${service} = {

2
hosts/nixedo/modules/containers/tubearchivist.nix
View file

@ -13,7 +13,7 @@ let
service = "tubearchivist"; service = "tubearchivist";
homelab = config.homelab; homelab = config.homelab;
port = homelab.ports.${service}; port = homelab.ports.services.${service};
in in
{ {
options.homelab.services.${service} = { options.homelab.services.${service} = {

4
hosts/nixedo/modules/nginx/oliverdavies.uk/default.nix
View file

@ -2,7 +2,7 @@
let let
ports = config.homelab.ports; ports = config.homelab.ports;
port = ports.nginx-website-sculpin; port = ports.nginx.website-sculpin;
redirects = builtins.concatStringsSep "\n" ( redirects = builtins.concatStringsSep "\n" (
map (r: "rewrite ^${r.from}/?$ ${r.to} redirect;") (import ./redirects.nix) map (r: "rewrite ^${r.from}/?$ ${r.to} redirect;") (import ./redirects.nix)
@ -26,7 +26,7 @@ let
"themes/custom/opdavies" "themes/custom/opdavies"
]; ];
port = ports.nginx-website-tome; port = ports.nginx.website-tome;
}; };
tomeLocations = builtins.listToAttrs ( tomeLocations = builtins.listToAttrs (

2
hosts/nixedo/modules/nginx/ponthirtaekwondo.co.uk.nix
View file

@ -3,7 +3,7 @@
let let
name = "ponthirtaekwondo.co.uk"; name = "ponthirtaekwondo.co.uk";
ports = config.homelab.ports; ports = config.homelab.ports;
port = ports.nginx-ponthir-taekwondo; port = ports.nginx.ponthir-taekwondo;
in in
{ {
security.acme.certs = { security.acme.certs = {

2
hosts/nixedo/modules/nginx/sites.nix
View file

@ -5,7 +5,7 @@ let
name: overrides: name: overrides:
let let
root = "/var/www/vhosts/${name}" + (overrides.rootSuffix or ""); root = "/var/www/vhosts/${name}" + (overrides.rootSuffix or "");
port = ports."nginx-${name}"; port = ports.nginx.${name};
url = "${name}.oliverdavies.uk"; url = "${name}.oliverdavies.uk";
in in
{ inherit port root url; } // overrides; { inherit port root url; } // overrides;

50
hosts/nixedo/ports.nix
View file

@ -6,33 +6,37 @@ in
{ {
options.homelab.ports = mkOption { options.homelab.ports = mkOption {
internal = true; internal = true;
type = types.attrsOf types.port; type = types.attrsOf (types.attrsOf types.port);
}; };
config.homelab.ports = { config.homelab.ports = {
mealie = 9001; services = {
pihole = 8082; mealie = 9001;
tubearchivist = 8099; pihole = 8082;
vaultwarden = 8022; tubearchivist = 8099;
vaultwarden = 8022;
};
nginx-website-sculpin = 8095; nginx = {
nginx-website-tome = 8098; website-sculpin = 8095;
website-tome = 8098;
nginx-books = 9002; books = 9002;
nginx-bootstrap-with-tailwind = 8081; bootstrap-with-tailwind = 8081;
nginx-eric = 8084; eric = 8084;
nginx-examples = 9003; examples = 9003;
nginx-florida-drupalcamp-tailwind-css = 8083; florida-drupalcamp-tailwind-css = 8083;
nginx-luke = 8094; luke = 8094;
nginx-phpsw-sculpin-demo = 8085; phpsw-sculpin-demo = 8085;
nginx-ponthir-taekwondo = 9004; ponthir-taekwondo = 9004;
nginx-rebuilding-acquia = 8086; rebuilding-acquia = 8086;
nginx-rebuilding-bartik = 8087; rebuilding-bartik = 8087;
nginx-rebuilding-bristol-js = 8088; rebuilding-bristol-js = 8088;
nginx-rebuilding-symfony = 8089; rebuilding-symfony = 8089;
nginx-tailwindcss-demo = 8090; tailwindcss-demo = 8090;
nginx-talking-drupal-tailwindcss = 8093; talking-drupal-tailwindcss = 8093;
nginx-wp-tailwind = 8091; wp-tailwind = 8091;
nginx-zet = 8092; zet = 8092;
};
}; };
} }

2
hosts/nixedo/services/mealie.nix
View file

@ -10,7 +10,7 @@ in
database.createLocally = true; database.createLocally = true;
port = ports.mealie; port = ports.services.mealie;
settings.ALLOW_SIGNUP = "false"; settings.ALLOW_SIGNUP = "false";
}; };

2
hosts/nixedo/services/vaultwarden.nix
View file

@ -32,7 +32,7 @@ in
config = { config = {
DOMAIN = "https://${cfg.url}"; DOMAIN = "https://${cfg.url}";
ROCKET_ADDRESS = "127.0.0.1"; ROCKET_ADDRESS = "127.0.0.1";
ROCKET_PORT = homelab.ports.${service}; ROCKET_PORT = homelab.ports.services.${service};
SIGNUPS_ALLOWED = false; SIGNUPS_ALLOWED = false;
}; };
}; };