From 4809eb83a4d784480a1e821ef1ffeb9474ce206c Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 3 Oct 2023 14:24:26 -0400 Subject: [PATCH] hosts: switch to flake.sh --- hosts/default.nix | 3 -- hosts/sakura/services/conduit.nix | 2 +- hosts/sakura/services/default.nix | 1 - hosts/sakura/services/forgejo.nix | 2 +- hosts/sakura/services/grafana.nix | 4 +-- hosts/sakura/services/hedgedoc.nix | 4 +-- hosts/sakura/services/traefik.nix | 42 +++++++++++---------------- hosts/sakura/services/vaultwarden.nix | 2 +- hosts/sakura/services/woodpecker.nix | 4 +-- hosts/sora/services/traefik.nix | 20 ++++--------- hosts/tsuki/default.nix | 1 - 11 files changed, 32 insertions(+), 53 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 4f7c633..6674ace 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -4,7 +4,6 @@ inputs: let hmModule = inputs.home-manager.nixosModules.home-manager; hyprlandModule = inputs.hyprland.homeManagerModules.default; ironbarModule = inputs.ironbar.homeManagerModules.default; - atticdModule = inputs.attic.nixosModules.atticd; nix-index-Module = inputs.nix-index-database.hmModules.nix-index; inherit (inputs.nixpkgs.lib) nixosSystem; in { @@ -15,7 +14,6 @@ in { ./tsuki sopsModule hmModule - atticdModule { home-manager = { useGlobalPkgs = true; @@ -40,7 +38,6 @@ in { ./sakura sopsModule hmModule - atticdModule { home-manager = { useGlobalPkgs = true; diff --git a/hosts/sakura/services/conduit.nix b/hosts/sakura/services/conduit.nix index c6ef1bf..452a5e8 100644 --- a/hosts/sakura/services/conduit.nix +++ b/hosts/sakura/services/conduit.nix @@ -5,7 +5,7 @@ settings = { global = { address = "0.0.0.0"; - server_name = "matrix.notohh.dev"; + server_name = "matrix.flake.sh"; allow_registration = true; allow_federation = false; allow_encryption = true; diff --git a/hosts/sakura/services/default.nix b/hosts/sakura/services/default.nix index 0701890..1e87626 100644 --- a/hosts/sakura/services/default.nix +++ b/hosts/sakura/services/default.nix @@ -10,7 +10,6 @@ ./dashdot.nix ./grafana.nix ./vaultwarden.nix - ./atticd.nix ./conduit.nix ./cloudflareddns.nix ]; diff --git a/hosts/sakura/services/forgejo.nix b/hosts/sakura/services/forgejo.nix index 79deb34..3a9fc15 100644 --- a/hosts/sakura/services/forgejo.nix +++ b/hosts/sakura/services/forgejo.nix @@ -19,7 +19,7 @@ server = { HTTP_PORT = 3200; DOMAIN = "git.notohh.dev"; - ROOT_URL = "https://git.notohh.dev"; + ROOT_URL = "https://git.flake.sh"; LANDING_PAGE = "/explore/repos"; }; database = { diff --git a/hosts/sakura/services/grafana.nix b/hosts/sakura/services/grafana.nix index f4a325d..8788c95 100644 --- a/hosts/sakura/services/grafana.nix +++ b/hosts/sakura/services/grafana.nix @@ -3,8 +3,8 @@ _: { enable = true; settings = { server = { - root_url = "https://metrics.notohh.dev"; - domain = "metrics.notohh.dev"; + root_url = "https://metrics.flake.sh"; + domain = "metrics.flake.sh"; enforce_domain = true; http_addr = "0.0.0.0"; http_port = 3100; diff --git a/hosts/sakura/services/hedgedoc.nix b/hosts/sakura/services/hedgedoc.nix index 98c7841..341bff5 100644 --- a/hosts/sakura/services/hedgedoc.nix +++ b/hosts/sakura/services/hedgedoc.nix @@ -3,8 +3,8 @@ _: { enable = true; settings = { port = 3300; - domain = "scratch.notohh.dev"; - allowOrigin = ["scratch.notohh.dev"]; + domain = "scratch.flake.sh"; + allowOrigin = ["scratch.flake.sh"]; allowAnonymous = true; allowFreeURL = true; allowEmailRegister = false; diff --git a/hosts/sakura/services/traefik.nix b/hosts/sakura/services/traefik.nix index 6aaf3de..5d9b4fb 100644 --- a/hosts/sakura/services/traefik.nix +++ b/hosts/sakura/services/traefik.nix @@ -46,59 +46,52 @@ middlewares = "authelia"; }; foundryvtt = { - rule = "Host(`foundry.notohh.dev`)"; + rule = "Host(`foundry.flake.sh`)"; entrypoints = ["websecure"]; service = "foundryvtt"; - tls.domains = [{main = "*.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; - gitea = { - rule = "Host(`git.notohh.dev`)"; + forgejo = { + rule = "Host(`git.flake.sh`)"; entrypoints = ["websecure"]; - service = "gitea"; - tls.domains = [{main = "*.notohh.dev";}]; + service = "forgejo"; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; rustypaste = { - rule = "Host(`img.notohh.dev`)"; + rule = "Host(`i.flake.sh`)"; entrypoints = ["websecure"]; service = "rustypaste"; - tls.domains = [{main = "*.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; grafana = { - rule = "Host(`metrics.notohh.dev`)"; + rule = "Host(`metrics.flake.sh`)"; entrypoints = ["websecure"]; service = "grafana"; - tls.domains = [{main = "*.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; woodpecker-server = { - rule = "Host(`ci.notohh.dev`)"; + rule = "Host(`ci.flake.sh`)"; entrypoints = ["websecure"]; service = "woodpecker-server"; - tls.domains = [{main = "*.notohh.dev";}]; - tls.certresolver = "production"; - }; - atticd = { - rule = "Host(`cache.notohh.dev`)"; - entrypoints = ["websecure"]; - service = "atticd"; - tls.domains = [{main = "*.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; hedgedoc = { - rule = "Host(`scratch.notohh.dev`)"; + rule = "Host(`scratch.flake.sh`)"; entrypoints = ["websecure"]; service = "hedgedoc"; - tls.domains = [{main = "*.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; vaultwarden = { - rule = "Host(`vault.notohh.dev`)"; + rule = "Host(`vault.flake.sh`)"; entrypoints = ["websecure"]; service = "vaultwarden"; - tls.domains = [{main = "*.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; }; @@ -107,11 +100,10 @@ dashdot.loadBalancer.servers = [{url = "http://localhost:4000";}]; hugo.loadBalancer.servers = [{url = "http://localhost:1313";}]; foundryvtt.loadBalancer.servers = [{url = "http://localhost:30000";}]; - gitea.loadBalancer.servers = [{url = "http://localhost:3200";}]; + forgejo.loadBalancer.servers = [{url = "http://localhost:3200";}]; rustypaste.loadBalancer.servers = [{url = "http://localhost:8000";}]; grafana.loadBalancer.servers = [{url = "http://localhost:3100";}]; woodpecker-server.loadBalancer.servers = [{url = "http://localhost:8200";}]; - atticd.loadBalancer.servers = [{url = "http://localhost:8100";}]; hedgedoc.loadBalancer.servers = [{url = "http://localhost:3300";}]; vaultwarden.loadBalancer.servers = [{url = "http://localhost:8222";}]; }; diff --git a/hosts/sakura/services/vaultwarden.nix b/hosts/sakura/services/vaultwarden.nix index 89594ea..e5b79d0 100644 --- a/hosts/sakura/services/vaultwarden.nix +++ b/hosts/sakura/services/vaultwarden.nix @@ -4,7 +4,7 @@ package = pkgs.vaultwarden-postgresql; dbBackend = "postgresql"; config = { - DOMAIN = "https://vault.notohh.dev/"; + DOMAIN = "https://vault.flake.sh/"; SIGNUPS_ALLOWED = false; DATABASE_URL = "postgresql://vaultwarden:vaultwarden@192.168.1.211:5432/vaultwarden"; LOG_LEVEL = "Info"; diff --git a/hosts/sakura/services/woodpecker.nix b/hosts/sakura/services/woodpecker.nix index 73e72bb..b3fae28 100644 --- a/hosts/sakura/services/woodpecker.nix +++ b/hosts/sakura/services/woodpecker.nix @@ -6,10 +6,10 @@ environment = { WOODPECKER_SERVER_ADDR = ":8200"; WOODPECKER_GRPC_ADDR = ":8300"; - WOODPECKER_HOST = "https://ci.notohh.dev"; + WOODPECKER_HOST = "https://ci.flake.sh"; WOODPECKER_OPEN = "false"; WOODPECKER_GITEA = "true"; - WOODPECKER_GITEA_URL = "https://git.notohh.dev"; + WOODPECKER_GITEA_URL = "https://git.flake.sh"; WOODPECKER_ADMIN = "notohh"; WOODPECKER_AGENT_SECRET = config.sops.secrets.woodpecker-agent-secret.path; WOODPECKER_LOG_LEVEL = "debug"; diff --git a/hosts/sora/services/traefik.nix b/hosts/sora/services/traefik.nix index bf68fc4..e22b011 100644 --- a/hosts/sora/services/traefik.nix +++ b/hosts/sora/services/traefik.nix @@ -26,38 +26,30 @@ service = "api@internal"; }; uptime-kuma = { - rule = "Host(`status.notohh.dev`)"; + rule = "Host(`status.flake.sh`)"; entrypoints = ["websecure"]; service = "uptime-kuma"; - tls.domains = [{main = "*.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; gotify = { - rule = "Host(`gotify.notohh.dev`)"; + rule = "Host(`gotify.flake.sh`)"; entrypoints = ["websecure"]; service = "gotify"; - tls.domains = [{main = "*.notohh.dev";}]; - tls.certresolver = "production"; - }; - neko = { - rule = "Host(`neko.notohh.dev`)"; - entrypoints = ["websecure"]; - service = "neko"; - tls.domains = [{main = "neko.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; conduit = { - rule = "Host(`matrix.notohh.dev`)"; + rule = "Host(`matrix.flake.sh`)"; entrypoints = ["websecure"]; service = "conduit"; - tls.domains = [{main = "matrix.notohh.dev";}]; + tls.domains = [{main = "*.flake.sh";}]; tls.certresolver = "production"; }; }; services = { uptime-kuma.loadBalancer.servers = [{url = "http://100.87.54.48:4000";}]; gotify.loadBalancer.servers = [{url = "http://100.87.54.48:3000";}]; - neko.loadBalancer.servers = [{url = "http://100.110.140.130:8080";}]; conduit.loadBalancer.servers = [{url = "http://100.121.201.47:6167";}]; }; }; diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 9c6cbb8..dcf3344 100755 --- a/hosts/tsuki/default.nix +++ b/hosts/tsuki/default.nix @@ -94,7 +94,6 @@ qemu_kvm pinentry-gtk2 jdk17 - attic-client comma inputs.matugen.packages.x86_64-linux.default ];