Compare commits
No commits in common. "1fd29c847b98f5c1b71ee68ca53a71765d7fcc6e" and "9ed9c46a418a856266930be62de49f83cbb12650" have entirely different histories.
1fd29c847b
...
9ed9c46a41
29 changed files with 67 additions and 170 deletions
|
@ -53,12 +53,10 @@ in
|
|||
Locked = true;
|
||||
};
|
||||
Homepage = {
|
||||
URL = "https://homepage.labs.adtya.xyz";
|
||||
StartPage = "homepage-locked";
|
||||
StartPage = "previous-session";
|
||||
Locked = true;
|
||||
};
|
||||
NetworkPrediction = false;
|
||||
NewTabPage = false;
|
||||
NoDefaultBookmarks = true;
|
||||
OfferToSaveLogins = false;
|
||||
OverrideFirstRunPage = "";
|
||||
|
|
|
@ -201,7 +201,6 @@ in
|
|||
|
||||
"SUPER,l, layoutmsg,rollnext"
|
||||
"SUPER,h, layoutmsg,rollprev"
|
||||
"SUPER_SHIFT,z, layoutmsg,orientationcycle left right"
|
||||
"SUPER,m, layoutmsg,focusmaster"
|
||||
"SUPER_SHIFT,m, layoutmsg,swapwithmaster"
|
||||
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
user = "mediaserver";
|
||||
group = "mediaserver";
|
||||
dataDir = "/mnt/data/bazarr";
|
||||
port = 6767;
|
||||
in
|
||||
{
|
||||
services.caddy.virtualHosts."bazarr.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
reverse_proxy 127.0.0.1:${toString port}
|
||||
'';
|
||||
};
|
||||
systemd.tmpfiles.settings."10-bazarr".${dataDir}.d = {
|
||||
inherit user group;
|
||||
mode = "0700";
|
||||
};
|
||||
|
||||
systemd.services.bazarr = {
|
||||
description = "Bazarr";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = user;
|
||||
Group = group;
|
||||
ExecStart = "${lib.getExe pkgs.bazarr} --port ${toString port} --config '${dataDir}'";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -5,9 +5,7 @@ _: {
|
|||
./radarr.nix
|
||||
./sonarr.nix
|
||||
./readarr.nix
|
||||
./prowlarr.nix
|
||||
./bazarr.nix
|
||||
./lidarr.nix
|
||||
./jackett.nix
|
||||
../../../shared/prometheus-exporters.nix
|
||||
../../../shared/promtail.nix
|
||||
];
|
||||
|
|
23
hosts/layne/services/apps/jackett.nix
Normal file
23
hosts/layne/services/apps/jackett.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
caddy.virtualHosts."jackett.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:9117
|
||||
'';
|
||||
};
|
||||
jackett = {
|
||||
enable = true;
|
||||
user = "mediaserver";
|
||||
group = "mediaserver";
|
||||
dataDir = "/mnt/data/jackett";
|
||||
port = 9117;
|
||||
};
|
||||
};
|
||||
systemd.services.radarr.unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
|
@ -9,12 +9,14 @@ in
|
|||
"jellyfin.local.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:8096
|
||||
'';
|
||||
};
|
||||
"jellyfin.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:8096
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
caddy.virtualHosts."lidarr.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
reverse_proxy 127.0.0.1:8686
|
||||
'';
|
||||
};
|
||||
lidarr = {
|
||||
enable = true;
|
||||
dataDir = "/mnt/data/lidarr";
|
||||
user = "mediaserver";
|
||||
group = "mediaserver";
|
||||
};
|
||||
};
|
||||
systemd.services.lidarr.unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{ pkgs, lib, ... }:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
user = "mediaserver";
|
||||
group = "mediaserver";
|
||||
dataDir = "/mnt/data/prowlarr";
|
||||
in
|
||||
{
|
||||
services.caddy.virtualHosts."prowlarr.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
reverse_proxy 127.0.0.1:9696
|
||||
'';
|
||||
};
|
||||
systemd.tmpfiles.settings."10-prowlarr".${dataDir}.d = {
|
||||
inherit user group;
|
||||
mode = "0700";
|
||||
};
|
||||
|
||||
systemd.services.prowlarr = {
|
||||
description = "Prowlarr";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
User = user;
|
||||
Group = group;
|
||||
ExecStart = "${lib.getExe pkgs.prowlarr} -nobrowser -data='${dataDir}'";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,12 +1,13 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
caddy.virtualHosts."radarr.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:7878
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
caddy.virtualHosts."readarr.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:8787
|
||||
'';
|
||||
};
|
||||
|
@ -17,5 +18,5 @@ in
|
|||
group = "mediaserver";
|
||||
};
|
||||
};
|
||||
systemd.services.readarr.unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
systemd.services.radarr.unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
}
|
||||
|
|
|
@ -1,12 +1,13 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
caddy.virtualHosts."sonarr.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:8989
|
||||
'';
|
||||
};
|
||||
|
@ -17,5 +18,5 @@ in
|
|||
group = "mediaserver";
|
||||
};
|
||||
};
|
||||
systemd.services.sanarr.unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
systemd.services.radarr.unitConfig.RequiresMountsFor = [ "/mnt/data" ];
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
|
@ -8,6 +8,7 @@ in
|
|||
virtualHosts."transmission.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:9091
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
domainName = "blocky.rico1.labs.adtya.xyz";
|
||||
in
|
||||
{
|
||||
|
@ -12,6 +12,7 @@ in
|
|||
virtualHosts."${domainName}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:8080
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
@ -16,24 +16,28 @@ in
|
|||
"gateway.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 192.168.0.1:80
|
||||
'';
|
||||
};
|
||||
"ap1.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 192.168.1.1:80
|
||||
'';
|
||||
};
|
||||
"ap2.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 192.168.1.2:80
|
||||
'';
|
||||
};
|
||||
"switch.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 192.168.1.3:80
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
domainName = "loki.labs.adtya.xyz";
|
||||
in
|
||||
{
|
||||
|
@ -9,6 +9,7 @@ in
|
|||
virtualHosts."${domainName}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:3100
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
domainName = "prometheus.labs.adtya.xyz";
|
||||
in
|
||||
{
|
||||
|
@ -9,6 +9,7 @@ in
|
|||
virtualHosts."${domainName}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:9090
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
domainName = "alertmanager.labs.adtya.xyz";
|
||||
in
|
||||
{
|
||||
|
@ -9,6 +9,7 @@ in
|
|||
virtualHosts."${domainName}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:9093
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
domainName = "blocky.rico2.labs.adtya.xyz";
|
||||
in
|
||||
{
|
||||
|
@ -12,6 +12,7 @@ in
|
|||
virtualHosts."${domainName}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:8080
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -4,7 +4,6 @@ _: {
|
|||
./blocky.nix
|
||||
./forgejo-actions-runner.nix
|
||||
./grafana.nix
|
||||
./homepage
|
||||
../../../shared/prometheus-exporters.nix
|
||||
../../../shared/promtail.nix
|
||||
];
|
||||
|
|
|
@ -20,14 +20,6 @@
|
|||
];
|
||||
tokenFile = config.sops.secrets."forgejo/runner_registration_token_file".path;
|
||||
url = "https://forge.acomputer.lol";
|
||||
settings = {
|
||||
log.level = "info";
|
||||
cache = {
|
||||
enabled = true;
|
||||
host = "192.168.1.12";
|
||||
external_server = "https://act-cache.labs.adtya.xyz/";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
_:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
domainName = "grafana.labs.adtya.xyz";
|
||||
in
|
||||
{
|
||||
|
@ -9,6 +9,7 @@ in
|
|||
virtualHosts."${domainName}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
reverse_proxy 127.0.0.1:9091
|
||||
'';
|
||||
};
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
{config, ...}:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
domainName = "homepage.labs.adtya.xyz";
|
||||
cfg = config.services.glance;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
caddy = {
|
||||
virtualHosts."${domainName}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
reverse_proxy ${cfg.settings.server.host}:${cfg.settings.server.port}
|
||||
'';
|
||||
};
|
||||
};
|
||||
glance = {
|
||||
enable = true;
|
||||
settings = {
|
||||
server = {
|
||||
host = "127.0.0.1";
|
||||
port = "5678";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -66,17 +66,13 @@
|
|||
|
||||
# Services
|
||||
"alertmanager.labs.adtya.xyz" = "10.10.10.12";
|
||||
"act-cache.labs.adtya.xyz" = "10.10.10.13";
|
||||
"bazarr.labs.adtya.xyz" = "10.10.10.14";
|
||||
"blocky.rico1.labs.adtya.xyz" = "10.10.10.11";
|
||||
"blocky.rico2.labs.adtya.xyz" = "10.10.10.12";
|
||||
"grafana.labs.adtya.xyz" = "10.10.10.12";
|
||||
"homepage.labs.adtya.xyz" = "10.10.10.12";
|
||||
"jackett.labs.adtya.xyz" = "10.10.10.14";
|
||||
"jellyfin.labs.adtya.xyz" = "10.10.10.14";
|
||||
"lidarr.labs.adtya.xyz" = "10.10.10.14";
|
||||
"loki.labs.adtya.xyz" = "10.10.10.11";
|
||||
"prometheus.labs.adtya.xyz" = "10.10.10.11";
|
||||
"prowlarr.labs.adtya.xyz" = "10.10.10.14";
|
||||
"radarr.labs.adtya.xyz" = "10.10.10.14";
|
||||
"readarr.labs.adtya.xyz" = "10.10.10.14";
|
||||
"sonarr.labs.adtya.xyz" = "10.10.10.14";
|
||||
|
|
|
@ -4,4 +4,10 @@
|
|||
format json
|
||||
level ERROR
|
||||
'';
|
||||
|
||||
tlsAcmeDnsChallenge = ''
|
||||
tls {
|
||||
dns hetzner {env.HETZNER_ACCESS_TOKEN}
|
||||
}
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -17,7 +17,6 @@ in
|
|||
package = inputs.caddy.packages.${pkgs.system}.caddy;
|
||||
email = "admin@acomputer.lol";
|
||||
globalConfig = ''
|
||||
acme_dns hetzner {env.HETZNER_ACCESS_TOKEN}
|
||||
servers {
|
||||
trusted_proxies static private_ranges 10.10.10.0/24
|
||||
client_ip_headers X-Forwarded-For X-Real-IP
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, config, ... }:
|
||||
let
|
||||
inherit (import ./caddy-helpers.nix) logFormat;
|
||||
inherit (import ./caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
in
|
||||
{
|
||||
services = {
|
||||
|
@ -12,6 +12,7 @@ in
|
|||
virtualHosts."${vHost}" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
metrics /caddy-metrics
|
||||
handle /metrics {
|
||||
reverse_proxy ${config.services.prometheus.exporters.node.listenAddress}:${toString config.services.prometheus.exporters.node.port}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
_: {
|
||||
{ config, ... }: {
|
||||
services = {
|
||||
promtail = {
|
||||
enable = true;
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
let
|
||||
cfg = config.services.forgejo;
|
||||
domainName = "forge.acomputer.lol";
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
in
|
||||
{
|
||||
sops.secrets = {
|
||||
|
@ -13,12 +12,6 @@ in
|
|||
};
|
||||
};
|
||||
services = {
|
||||
caddy.virtualHosts."act-cache.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
reverse_proxy 127.0.0.1:7777
|
||||
'';
|
||||
};
|
||||
gitea-actions-runner = {
|
||||
package = pkgs.forgejo-runner;
|
||||
instances = {
|
||||
|
@ -33,14 +26,6 @@ in
|
|||
];
|
||||
tokenFile = config.sops.secrets."forgejo/runner_registration_token_file".path;
|
||||
url = "https://${domainName}";
|
||||
settings = {
|
||||
log.level = "info";
|
||||
cache = {
|
||||
enabled = true;
|
||||
port = 7777;
|
||||
external_server = "https://act-cache.labs.adtya.xyz/";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, config, ... }:
|
||||
let
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat;
|
||||
inherit (import ../../../shared/caddy-helpers.nix) logFormat tlsAcmeDnsChallenge;
|
||||
domainName = "ntfy.acomputer.lol";
|
||||
in
|
||||
{
|
||||
|
@ -9,6 +9,7 @@ in
|
|||
"${config.networking.hostName}.labs.adtya.xyz" = {
|
||||
inherit logFormat;
|
||||
extraConfig = ''
|
||||
${tlsAcmeDnsChallenge}
|
||||
handle /ntfy-metrics {
|
||||
uri replace /ntfy-metrics /metrics
|
||||
reverse_proxy ${config.services.ntfy-sh.settings.metrics-listen-http}
|
||||
|
|
Loading…
Reference in a new issue