move xunuwu.xyz base site to rackserv

This commit is contained in:
xunuwu 2025-06-22 00:09:15 +02:00
parent aa66943501
commit 1decdd222e
Signed by: xun
SSH key fingerprint: SHA256:Uot/1WoAjWAeqLOHA5vYy4phhVydsH7jCPmBjaPZfgI
2 changed files with 11 additions and 12 deletions

View file

@ -1,8 +1,6 @@
{ {
config, config,
vars, vars,
inputs,
pkgs,
... ...
}: let }: let
inherit (vars) domain; inherit (vars) domain;
@ -61,14 +59,6 @@ in {
glances = mkPrivateEntry "glances" "${bridge}:${toString config.services.glances.port}"; glances = mkPrivateEntry "glances" "${bridge}:${toString config.services.glances.port}";
alertmanager = mkPrivateEntry "alerts" "${bridge}:${toString config.services.prometheus.alertmanager.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 = { other = {
hostName = "*.${domain}:80"; hostName = "*.${domain}:80";
extraConfig = '' extraConfig = ''

View file

@ -1,6 +1,8 @@
{ {
vars, vars,
config, config,
pkgs,
inputs,
... ...
}: let }: let
inherit (vars) domain; inherit (vars) domain;
@ -37,13 +39,20 @@ in {
forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT; forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT;
in { in {
misc = { misc = {
hostName = "${domain}"; hostName = "*.${domain}";
serverAliases = ["*.${domain}"];
useACMEHost = domain; useACMEHost = domain;
extraConfig = '' extraConfig = ''
reverse_proxy ${hopper} reverse_proxy ${hopper}
''; '';
}; };
base = {
hostName = "${domain}";
useACMEHost = domain;
extraConfig = ''
root * ${inputs.own-website.packages.${pkgs.system}.default}
file_server
'';
};
forgejo = { forgejo = {
hostName = "git.${domain}"; hostName = "git.${domain}";
useACMEHost = domain; useACMEHost = domain;