Compare commits

..

3 commits

4 changed files with 19 additions and 24 deletions

View file

@ -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 = ''

View file

@ -1,6 +1,8 @@
{
vars,
config,
pkgs,
inputs,
...
}: let
inherit (vars) domain;
@ -36,14 +38,28 @@ in {
virtualHosts = let
forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT;
in {
misc = {
hostName = "${domain}";
serverAliases = ["*.${domain}"];
hopper = {
hostName = "";
serverAliases = [
"navidrome.${domain}"
"vw.${domain}"
"abs.${domain}"
"rss.${domain}"
];
useACMEHost = domain;
logFormat = "output file ${config.services.caddy.logDir}/access-hopper.log";
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;

View file

@ -8,14 +8,4 @@
options = "--delete-older-than 14d";
};
nix.optimise.automatic = true;
systemd.services.remove-old-nix-gc-roots = let
beforeDate = "last month";
in {
description = "Remove old nix gc roots";
script = "exec ${lib.getExe pkgs.findutils} /nix/var/nix/gcroots/auto -not -newermt \"${beforeDate}\" -delete";
serviceConfig.Type = "oneshot";
before = ["nix-gc.service"];
requiredBy = ["nix-gc.service"];
};
}

View file

@ -11,7 +11,6 @@
settings = {
builders-use-substitutes = true;
keep-outputs = true;
keep-derivations = true;
accept-flake-config = true;
use-xdg-base-directories = true;