From 1decdd222e736bb44b6b2e7a9260f2976fa85407 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Sun, 22 Jun 2025 00:09:15 +0200
Subject: [PATCH] move xunuwu.xyz base site to rackserv

---
 hosts/hopper/profiles/lab/caddy.nix | 10 ----------
 hosts/rackserv/profiles/caddy.nix   | 13 +++++++++++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/hosts/hopper/profiles/lab/caddy.nix b/hosts/hopper/profiles/lab/caddy.nix
index d549397..1466ebf 100644
--- a/hosts/hopper/profiles/lab/caddy.nix
+++ b/hosts/hopper/profiles/lab/caddy.nix
@@ -1,8 +1,6 @@
 {
   config,
   vars,
-  inputs,
-  pkgs,
   ...
 }: let
   inherit (vars) domain;
@@ -61,14 +59,6 @@ in {
       glances = mkPrivateEntry "glances" "${bridge}:${toString config.services.glances.port}";
       alertmanager = mkPrivateEntry "alerts" "${bridge}:${toString config.services.prometheus.alertmanager.port}";
 
-      base = {
-        hostName = "${domain}:80";
-        extraConfig = ''
-          root * ${inputs.own-website.packages.${pkgs.system}.default}
-          file_server
-        '';
-      };
-
       other = {
         hostName = "*.${domain}:80";
         extraConfig = ''
diff --git a/hosts/rackserv/profiles/caddy.nix b/hosts/rackserv/profiles/caddy.nix
index 561ef96..cbbd287 100644
--- a/hosts/rackserv/profiles/caddy.nix
+++ b/hosts/rackserv/profiles/caddy.nix
@@ -1,6 +1,8 @@
 {
   vars,
   config,
+  pkgs,
+  inputs,
   ...
 }: let
   inherit (vars) domain;
@@ -37,13 +39,20 @@ in {
       forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT;
     in {
       misc = {
-        hostName = "${domain}";
-        serverAliases = ["*.${domain}"];
+        hostName = "*.${domain}";
         useACMEHost = domain;
         extraConfig = ''
           reverse_proxy ${hopper}
         '';
       };
+      base = {
+        hostName = "${domain}";
+        useACMEHost = domain;
+        extraConfig = ''
+          root * ${inputs.own-website.packages.${pkgs.system}.default}
+          file_server
+        '';
+      };
       forgejo = {
         hostName = "git.${domain}";
         useACMEHost = domain;