feat: added other two domains, redirects to main domain
This commit is contained in:
parent
77244a2a6f
commit
3a66e5958a
6 changed files with 37 additions and 118 deletions
118
flake.lock
generated
118
flake.lock
generated
|
|
@ -1,24 +1,5 @@
|
|||
{
|
||||
"nodes": {
|
||||
"deno2nix": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1767824708,
|
||||
"narHash": "sha256-UL8Jdh4UoBc25nyq9xkAMnqT1886DzymPbhI4/+/KUQ=",
|
||||
"owner": "Makesesama",
|
||||
"repo": "deno2nix",
|
||||
"rev": "e1b0a16c6148991f3d9e902b68aa1cb532173b8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Makesesama",
|
||||
"repo": "deno2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -60,24 +41,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hexname-backend": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
|
|
@ -98,25 +61,6 @@
|
|||
"url": "ssh://forgejo@git.lukadeka.com:6968/LukaDeka/HexName-Backend.git"
|
||||
}
|
||||
},
|
||||
"hexname-frontend": {
|
||||
"inputs": {
|
||||
"deno2nix": "deno2nix",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1769709099,
|
||||
"narHash": "sha256-Y5uALgdWMSRp8rqFFiv+iQCcs/HLoYvl0KxFaqNqlGE=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "bbbb5e9f5ba8f5c18415b4ca5c03d57e45937095",
|
||||
"revCount": 18,
|
||||
"type": "git",
|
||||
"url": "ssh://forgejo@git.lukadeka.com:6968/LukaDeka/HexName-Frontend.git"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "ssh://forgejo@git.lukadeka.com:6968/LukaDeka/HexName-Frontend.git"
|
||||
}
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
|
|
@ -126,11 +70,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768908532,
|
||||
"narHash": "sha256-HIdLXEFaUVE8FiaCPJbCfBMsnF+mVtDub8Jwj2BD+mk=",
|
||||
"lastModified": 1769799857,
|
||||
"narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"rev": "8d97452673640eb7fabe428e8b6a425bc355008b",
|
||||
"rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -141,11 +85,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1769527094,
|
||||
"narHash": "sha256-xV20Alb7ZGN7qujnsi5lG1NckSUmpIb05H2Xar73TDc=",
|
||||
"lastModified": 1769740369,
|
||||
"narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "afce96367b2e37fc29afb5543573cd49db3357b7",
|
||||
"rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -172,38 +116,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1767767207,
|
||||
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1769461804,
|
||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1769461804,
|
||||
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||
|
|
@ -222,8 +134,7 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"hexname-backend": "hexname-backend",
|
||||
"hexname-frontend": "hexname-frontend",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
}
|
||||
},
|
||||
|
|
@ -258,21 +169,6 @@
|
|||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
13
flake.nix
13
flake.nix
|
|
@ -6,23 +6,20 @@
|
|||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
|
||||
hexname-backend.url = "git+ssh://forgejo@git.lukadeka.com:6968/LukaDeka/HexName-Backend.git";
|
||||
hexname-frontend.url = "git+ssh://forgejo@git.lukadeka.com:6968/LukaDeka/HexName-Frontend.git";
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, nixpkgs-stable, hexname-backend, hexname-frontend, ... } @ inputs: {
|
||||
outputs = { nixpkgs, nixpkgs-stable, hexname-backend, ... } @ inputs: {
|
||||
nixosConfigurations = {
|
||||
hexname-ns1 = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs hexname-backend hexname-frontend; };
|
||||
specialArgs = { inherit inputs hexname-backend; };
|
||||
modules = [
|
||||
######## Boilerplate ########
|
||||
######## Basics ########
|
||||
./configuration.nix
|
||||
./hardware-configuration.nix
|
||||
|
||||
./pkgs/extra.nix
|
||||
|
||||
######## HexName configuration ########
|
||||
# ./pkgs/reverse-proxy.nix
|
||||
./pkgs/reverse-proxy.nix
|
||||
./pkgs/nginx.nix
|
||||
./pkgs/backend.nix
|
||||
|
||||
|
|
@ -41,6 +38,8 @@
|
|||
./pkgs/aliases.nix
|
||||
|
||||
######## etc. ########
|
||||
./pkgs/extra.nix
|
||||
./pkgs/zfs.nix
|
||||
|
||||
######## Scripts ########
|
||||
./services/update-containers.nix # Runs podman pull weekly
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
iptables
|
||||
openssl # Generate secure passwords with: $ openssl rand -base64 48
|
||||
jq
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
wal_level = "logical";
|
||||
max_wal_senders = "5";
|
||||
max_replication_slots = "5";
|
||||
listen_addresses = lib.mkForce "127.0.0.1,100.123.91.36";
|
||||
};
|
||||
|
||||
# Allow root to log in as postgres in the DB (for the PowerDNS container)
|
||||
|
|
@ -18,6 +19,10 @@
|
|||
# postgres root postgres
|
||||
# '';
|
||||
|
||||
authentication = ''
|
||||
host all replication_user 100.112.93.9/32 scram-sha-256
|
||||
'';
|
||||
|
||||
# authentication = lib.mkForce ''
|
||||
# # TYPE DATABASE USER ADDRESS AUTH-METHOD [auth-options]
|
||||
# # host hexname-backend hexname-backend 127.0.0.1/24 scram-sha-256
|
||||
|
|
|
|||
|
|
@ -28,6 +28,16 @@ in
|
|||
enableACME = true;
|
||||
globalRedirect = domain;
|
||||
};
|
||||
"loves-beer.com" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
globalRedirect = domain;
|
||||
};
|
||||
"dickdns.org" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
globalRedirect = domain;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,15 @@ flush_rrsets() {
|
|||
|
||||
add_record "NS" 604800 "hexname.com." "ns1.hexname.com."
|
||||
add_record "NS" 604800 "hexname.com." "ns2.hexname.com."
|
||||
# add_record "NS" 604800 "loves-beer.com." "ns1.hexname.com."
|
||||
# add_record "NS" 604800 "loves-beer.com." "ns2.hexname.com."
|
||||
# add_record "NS" 604800 "dickdns.org." "ns1.hexname.com."
|
||||
# add_record "NS" 604800 "dickdns.org." "ns2.hexname.com."
|
||||
|
||||
add_record "A" 604800 "hexname.com." "188.245.239.209"
|
||||
# add_record "CNAME" 604800 "loves-beer.com." "hexname.com."
|
||||
# add_record "CNAME" 604800 "dickdns-org." "hexname.com."
|
||||
|
||||
add_record "A" 604800 "ns1.hexname.com." "188.245.239.209"
|
||||
add_record "A" 604800 "ns2.hexname.com." "91.99.69.65"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue