bunch of updates to use more effecient DNS split paths
This commit is contained in:
parent
160be6071e
commit
1717f8e3e9
15 changed files with 151 additions and 1145 deletions
1115
hosts/linode/l001/flake.lock
generated
1115
hosts/linode/l001/flake.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,9 +1,10 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
home-manager.url = "github:rycee/home-manager/release-24.11";
|
||||
deploy-rs.url = "github:serokell/deploy-rs";
|
||||
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
|
||||
ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
|
||||
common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles?rev=39edfefa5871d07c9f88ce92a55995eb347d9b09";
|
||||
common.inputs.home-manager.follows = "home-manager";
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
@ -11,7 +12,6 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
common,
|
||||
ros_neovim,
|
||||
deploy-rs,
|
||||
...
|
||||
}:
|
||||
|
|
@ -40,7 +40,6 @@
|
|||
lib.nixosSystem {
|
||||
modules = [
|
||||
common.nixosModules.default
|
||||
ros_neovim.nixosModules.default
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
./linode.nix
|
||||
|
|
@ -49,11 +48,6 @@
|
|||
(
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
bitwarden
|
||||
vaultwarden
|
||||
];
|
||||
|
||||
ringofstorms_common = {
|
||||
systemName = configuration_name;
|
||||
general = {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
|
||||
config = {
|
||||
# TODO backup /var/lib/headscale data
|
||||
# TODO https://github.com/gurucomputing/headscale-ui ?
|
||||
|
|
@ -17,6 +16,31 @@
|
|||
dns = {
|
||||
magic_dns = true;
|
||||
base_domain = "net.joshuabell.xyz";
|
||||
extra_records =
|
||||
let
|
||||
h001ARecord = name: {
|
||||
type = "A";
|
||||
name = "${name}.joshuabell.xyz";
|
||||
value = "100.64.0.13";
|
||||
};
|
||||
|
||||
in
|
||||
[
|
||||
# {
|
||||
# type = "A";
|
||||
# name = "jellyfin.joshuabell.xyz";
|
||||
# value = "100.64.0.13";
|
||||
# }
|
||||
h001ARecord "jellyfin"
|
||||
h001ARecord "media"
|
||||
h001ARecord "notes"
|
||||
h001ARecord "chat"
|
||||
h001ARecord "sso-proxy"
|
||||
h001ARecord "n8n"
|
||||
h001ARecord "sso"
|
||||
h001ARecord "gist"
|
||||
h001ARecord "git"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
{
|
||||
security.acme.acceptTerms = true;
|
||||
security.acme.email = "admin@joshuabell.xyz";
|
||||
# security.acme.default.email = "admin@joshuabell.xyz";
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedGzipSettings = true;
|
||||
|
|
@ -11,29 +12,16 @@
|
|||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
virtualHosts = {
|
||||
# default that is put first for fallbacks
|
||||
# Note that order here doesn't matter it orders alphabetically so `0` puts it first
|
||||
# I had an issue tha the first SSL port 443 site would catch any https traffic instead
|
||||
# of hitting my default fallback and this fixes that issue and ensure this is hit instead
|
||||
"001.linodes.joshuabell.xyz" = {
|
||||
default = true;
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
return = "444"; # 404 for not found or 444 for drop
|
||||
};
|
||||
};
|
||||
"172.236.111.33" = {
|
||||
locations."/" = {
|
||||
return = "444";
|
||||
};
|
||||
};
|
||||
"2600:3c06::f03c:95ff:fe1c:84d3" = {
|
||||
locations."/" = {
|
||||
return = "444";
|
||||
};
|
||||
};
|
||||
|
||||
# "172.236.111.33" = {
|
||||
# locations."/" = {
|
||||
# return = "444";
|
||||
# };
|
||||
# };
|
||||
# "2600:3c06::f03c:95ff:fe1c:84d3" = {
|
||||
# locations."/" = {
|
||||
# return = "444";
|
||||
# };
|
||||
# };
|
||||
"headscale.joshuabell.xyz" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
|
@ -42,6 +30,13 @@
|
|||
proxyPass = "http://localhost:8080"; # headscale
|
||||
};
|
||||
};
|
||||
"_" = {
|
||||
rejectSSL = true;
|
||||
default = true;
|
||||
locations."/" = {
|
||||
return = "444"; # 404 for not found or 444 for drop
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue