This commit is contained in:
parent
bf21b3b7c8
commit
1461f863bd
12
flake.lock
12
flake.lock
|
@ -206,11 +206,11 @@
|
||||||
"utils": "utils_3"
|
"utils": "utils_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1658982026,
|
"lastModified": 1659059370,
|
||||||
"narHash": "sha256-P5SjpQsfmLWKqmFUewkYgW3vd7UW5gBtatw2ZYJ3+N4=",
|
"narHash": "sha256-JrD97kjloTgkuHRCHbvTCFJLnRQTICYwbR4QzXk6nnU=",
|
||||||
"owner": "jyooru",
|
"owner": "jyooru",
|
||||||
"repo": "nix-minecraft-servers",
|
"repo": "nix-minecraft-servers",
|
||||||
"rev": "30a8e061a1cd578dae6f54172d6932dfb075e765",
|
"rev": "927bd0ae6473b431ccab8aff20eb04eb4323d627",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -257,11 +257,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1658826464,
|
"lastModified": 1658985157,
|
||||||
"narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=",
|
"narHash": "sha256-f8JN0mQGSaEfw6HjMST0yViBTln/kzfTxe+qHutzvEI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac",
|
"rev": "bba87fc2a33618d86233fbdddc6b84971e6b5558",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -99,6 +99,7 @@
|
||||||
hostname = "minecraft";
|
hostname = "minecraft";
|
||||||
ip = "10.42.42.21";
|
ip = "10.42.42.21";
|
||||||
mac = "EA:30:73:E4:B6:69";
|
mac = "EA:30:73:E4:B6:69";
|
||||||
|
nix = false;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
hostname = "gitea";
|
hostname = "gitea";
|
||||||
|
|
|
@ -55,6 +55,7 @@ in
|
||||||
virtualHosts."md.0x76.dev" = proxy "http://hedgedoc.olympus:3000/";
|
virtualHosts."md.0x76.dev" = proxy "http://hedgedoc.olympus:3000/";
|
||||||
virtualHosts."git.0x76.dev" = proxy "http://gitea.olympus:3000";
|
virtualHosts."git.0x76.dev" = proxy "http://gitea.olympus:3000";
|
||||||
virtualHosts."o.0x76.dev" = proxy "http://minio.olympus:9000";
|
virtualHosts."o.0x76.dev" = proxy "http://minio.olympus:9000";
|
||||||
|
virtualHosts."grafana.0x76.dev" = proxy "http://victoriametrics.olympus:2342";
|
||||||
|
|
||||||
# Meow
|
# Meow
|
||||||
virtualHosts."meowy.tech" = {
|
virtualHosts."meowy.tech" = {
|
||||||
|
|
|
@ -37,7 +37,10 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
prometheusConfig = {
|
prometheusConfig = {
|
||||||
global.scrape_interval = "5s";
|
global = {
|
||||||
|
scrape_interval = "1m";
|
||||||
|
scrape_timeout = "30s";
|
||||||
|
};
|
||||||
scrape_configs = [
|
scrape_configs = [
|
||||||
{
|
{
|
||||||
job_name = "synapse";
|
job_name = "synapse";
|
||||||
|
@ -60,6 +63,8 @@ in
|
||||||
enable = true;
|
enable = true;
|
||||||
addr = "0.0.0.0";
|
addr = "0.0.0.0";
|
||||||
port = 2342;
|
port = 2342;
|
||||||
|
domain = "grafana.0x76.dev";
|
||||||
|
rootUrl = "https://grafana.0x76.dev";
|
||||||
security.adminPasswordFile = "${vs.grafana}/password";
|
security.adminPasswordFile = "${vs.grafana}/password";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,6 +45,11 @@ let vs = config.vault-secrets.secrets; in
|
||||||
publicKey = "K+99mvSYs4urcclreQDLA1pekD4xtu/mpS2uVWw8Bws=";
|
publicKey = "K+99mvSYs4urcclreQDLA1pekD4xtu/mpS2uVWw8Bws=";
|
||||||
allowedIPs = [ "10.100.0.2/32" ];
|
allowedIPs = [ "10.100.0.2/32" ];
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
# Laura's laptop
|
||||||
|
publicKey = "ZWIaDGrASlTkEK75j10VeGCvrIGfpk4GPobmqcYX2D0=";
|
||||||
|
allowedIPs = [ "10.100.0.3/32" ];
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue