feat(servers): move caddy to cluster
All checks were successful
Discord / discord commits (push) Successful in 27s

This commit is contained in:
matt1432 2024-01-22 22:47:31 -05:00
parent b484bd7556
commit 295f8d2c67
5 changed files with 15 additions and 7 deletions

View file

@ -8,7 +8,6 @@ in {
../../modules/sshd.nix ../../modules/sshd.nix
../../modules/tailscale.nix ../../modules/tailscale.nix
./modules/corosync.nix
./modules/pacemaker ./modules/pacemaker
]; ];

View file

@ -31,6 +31,7 @@ in {
dockerIP = "10.0.0.122"; dockerIP = "10.0.0.122";
jellyIP = "10.0.0.123"; jellyIP = "10.0.0.123";
servivi = "10.0.0.249"; servivi = "10.0.0.249";
oksysIP = "10.0.0.213";
in { in {
"nelim.org" = { "nelim.org" = {
serverAliases = ["*.nelim.org"]; serverAliases = ["*.nelim.org"];
@ -45,7 +46,7 @@ in {
# Misc one-liners # Misc one-liners
vault.reverseProxy = "${dockerIP}:8781"; vault.reverseProxy = "${dockerIP}:8781";
hauk.reverseProxy = "${dockerIP}:3003"; hauk.reverseProxy = "${dockerIP}:3003";
headscale.reverseProxy = "localhost:8085"; headscale.reverseProxy = "${oksysIP}:8085";
jelly.reverseProxy = "${jellyIP}:80"; jelly.reverseProxy = "${jellyIP}:80";
# Resume builder # Resume builder
@ -53,7 +54,6 @@ in {
resauth.reverseProxy = "${dockerIP}:3100"; resauth.reverseProxy = "${dockerIP}:3100";
# Nextcloud & Co # Nextcloud & Co
bakail.reverseProxy = "${dockerIP}:8077";
office.reverseProxy = "http://${dockerIP}:8055"; office.reverseProxy = "http://${dockerIP}:8055";
nextcloud = { nextcloud = {
subDomainName = "cloud"; subDomainName = "cloud";

View file

@ -1,10 +1,20 @@
{...}: { {...}: {
imports = [./options.nix]; imports = [
./options.nix
../corosync.nix
../caddy.nix
];
# TODO: update script # TODO: update script
services.pacemaker = { services.pacemaker = {
enable = true; enable = true;
resources = {}; resources = {
"caddy" = {
enable = true;
virtualIp = "10.0.0.130";
};
};
}; };
} }

View file

@ -15,7 +15,6 @@ in {
../../modules/tailscale.nix ../../modules/tailscale.nix
./modules/blocky.nix ./modules/blocky.nix
./modules/caddy.nix
./modules/headscale ./modules/headscale
./modules/remote-builder.nix ./modules/remote-builder.nix
./modules/unbound.nix ./modules/unbound.nix

View file

@ -19,7 +19,7 @@ in {
enable = true; enable = true;
package = headscale-flake; package = headscale-flake;
address = "127.0.0.1"; address = "10.0.0.213";
port = 8085; port = 8085;
settings = { settings = {