Compare commits
No commits in common. "67b829783d1e0eb1522dd4ae7b35c33db4ce7087" and "aa66943501c8ee59b8a19dd5b4c0191f1d43bde2" have entirely different histories.
67b829783d
...
aa66943501
4 changed files with 24 additions and 19 deletions
|
@ -1,6 +1,8 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
vars,
|
vars,
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (vars) domain;
|
inherit (vars) domain;
|
||||||
|
@ -59,6 +61,14 @@ 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 = ''
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{
|
{
|
||||||
vars,
|
vars,
|
||||||
config,
|
config,
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (vars) domain;
|
inherit (vars) domain;
|
||||||
|
@ -38,28 +36,14 @@ in {
|
||||||
virtualHosts = let
|
virtualHosts = let
|
||||||
forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT;
|
forgejoPort = toString config.services.forgejo.settings.server.HTTP_PORT;
|
||||||
in {
|
in {
|
||||||
hopper = {
|
misc = {
|
||||||
hostName = "";
|
hostName = "${domain}";
|
||||||
serverAliases = [
|
serverAliases = ["*.${domain}"];
|
||||||
"navidrome.${domain}"
|
|
||||||
"vw.${domain}"
|
|
||||||
"abs.${domain}"
|
|
||||||
"rss.${domain}"
|
|
||||||
];
|
|
||||||
useACMEHost = domain;
|
useACMEHost = domain;
|
||||||
logFormat = "output file ${config.services.caddy.logDir}/access-hopper.log";
|
|
||||||
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;
|
||||||
|
|
|
@ -8,4 +8,14 @@
|
||||||
options = "--delete-older-than 14d";
|
options = "--delete-older-than 14d";
|
||||||
};
|
};
|
||||||
nix.optimise.automatic = true;
|
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"];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
builders-use-substitutes = true;
|
builders-use-substitutes = true;
|
||||||
|
keep-outputs = true;
|
||||||
keep-derivations = true;
|
keep-derivations = true;
|
||||||
accept-flake-config = true;
|
accept-flake-config = true;
|
||||||
use-xdg-base-directories = true;
|
use-xdg-base-directories = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue