forked from DGNum/infrastructure
Compare commits
1 commit
main
...
npins-upda
| Author | SHA1 | Date | |
|---|---|---|---|
| 3aaed6f547 |
6 changed files with 27 additions and 84 deletions
|
|
@ -21,7 +21,6 @@ lib.extra.mkConfig {
|
|||
"librenms"
|
||||
"mastodon"
|
||||
"nextcloud"
|
||||
"ollama-proxy"
|
||||
"outline"
|
||||
"plausible"
|
||||
"postgresql"
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
{
|
||||
pkgs,
|
||||
nodes,
|
||||
meta,
|
||||
...
|
||||
}:
|
||||
{
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedProxySettings = true;
|
||||
virtualHosts."ollama01.beta.dgnum.eu" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://${meta.network.krz01.netbirdIp}:${toString nodes.krz01.config.services.ollama.port}";
|
||||
basicAuthFile = pkgs.writeText "ollama-htpasswd" ''
|
||||
raito:$y$j9T$UDEHpLtM52hRGK0I4qT6M0$N75AhENLqgtJnTGaPzq51imhjZvuPr.ow81Co1ZTcX2
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
];
|
||||
}
|
||||
|
|
@ -2,8 +2,6 @@
|
|||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
meta,
|
||||
name,
|
||||
...
|
||||
}:
|
||||
|
||||
|
|
@ -14,11 +12,11 @@ lib.extra.mkConfig {
|
|||
|
||||
enabledServices = [
|
||||
# INFO: This list needs to stay sorted alphabetically
|
||||
# Machine learning API machine
|
||||
"microvm-ml01"
|
||||
"microvm-router01"
|
||||
"nvidia-tesla-k80"
|
||||
"proxmox"
|
||||
# Machine learning API machine
|
||||
"microvm-ml01"
|
||||
];
|
||||
|
||||
extraConfig = {
|
||||
|
|
@ -59,11 +57,8 @@ lib.extra.mkConfig {
|
|||
];
|
||||
}))
|
||||
];
|
||||
|
||||
services = {
|
||||
ollama = {
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
host = meta.network.${name}.netbirdIp;
|
||||
package = pkgs.callPackage ./ollama.nix {
|
||||
cudaPackages = pkgs.cudaPackages_11;
|
||||
# We need to thread our nvidia x11 driver for CUDA.
|
||||
|
|
@ -72,8 +67,5 @@ lib.extra.mkConfig {
|
|||
};
|
||||
};
|
||||
|
||||
networking.firewall.interfaces.wt0.allowedTCPPorts = [ config.services.ollama.port ];
|
||||
};
|
||||
|
||||
root = ./.;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,8 +15,6 @@ let
|
|||
];
|
||||
|
||||
buckets = [
|
||||
"monorepo-terraform-state"
|
||||
|
||||
"banda-website"
|
||||
"castopod-dgnum"
|
||||
"hackens-website"
|
||||
|
|
@ -79,17 +77,6 @@ in
|
|||
users.groups.garage = { };
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
"s3-admin.dgnum.eu" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
||||
locations."/".extraConfig = ''
|
||||
proxy_pass http://127.0.0.1:3903;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header Host $host;
|
||||
'';
|
||||
};
|
||||
|
||||
${host} = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
|
|
|
|||
|
|
@ -68,12 +68,6 @@ let
|
|||
"support" # Zammad support
|
||||
"telegraf" # Telegraf
|
||||
|
||||
# Beta-grade machine learning API servers
|
||||
"ollama01.beta"
|
||||
"openui.beta"
|
||||
"whisper.beta"
|
||||
"stable-diffusion.beta"
|
||||
|
||||
# DGSI
|
||||
"dgsi"
|
||||
"profil"
|
||||
|
|
@ -93,8 +87,6 @@ let
|
|||
"*.s3"
|
||||
"cdn"
|
||||
"s3"
|
||||
# The administration endpoint for Garage.
|
||||
"s3-admin"
|
||||
];
|
||||
|
||||
rescue01.dual = [
|
||||
|
|
|
|||
|
|
@ -144,9 +144,9 @@
|
|||
"url": "https://git.lix.systems/lix-project/lix.git"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "ed9b7f4f84fd60ad8618645cc1bae2d686ff0db6",
|
||||
"revision": "9865ebaaa618d82a7b7fdccc636cbaa7dfa42427",
|
||||
"url": null,
|
||||
"hash": "05kxga8fs9h4qm0yvp5l7jvsda7hzqs7rvxcn8r52dqg3c80hva9"
|
||||
"hash": "1h3v75nyzgi5yg1hgngb5jxh6sa2mr3bpnl7spvlks3w6k7fl0v4"
|
||||
},
|
||||
"lix-module": {
|
||||
"type": "Git",
|
||||
|
|
@ -239,8 +239,8 @@
|
|||
"nixos-24.05": {
|
||||
"type": "Channel",
|
||||
"name": "nixos-24.05",
|
||||
"url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.5518.ecbc1ca8ffd6/nixexprs.tar.xz",
|
||||
"hash": "1yr2v17d8jg9567rvadv62bpr6i47fp73by2454yjxh1m9ric2cm"
|
||||
"url": "https://releases.nixos.org/nixos/24.05/nixos-24.05.5596.d51c28603def/nixexprs.tar.xz",
|
||||
"hash": "1vi6c5418x3x63hay8n91n33yqh69rizmwk84fnym0jzwisiayy1"
|
||||
},
|
||||
"nixos-generators": {
|
||||
"type": "Git",
|
||||
|
|
@ -250,21 +250,21 @@
|
|||
"repo": "nixos-generators"
|
||||
},
|
||||
"branch": "master",
|
||||
"revision": "9ae128172f823956e54947fe471bc6dfa670ecb4",
|
||||
"url": "https://github.com/nix-community/nixos-generators/archive/9ae128172f823956e54947fe471bc6dfa670ecb4.tar.gz",
|
||||
"hash": "1zn3lykymimzh21q4fixw6ql42n8j82dqwm5axifhcnl8dsdgrvr"
|
||||
"revision": "40c8d30c490414910fc63626ad1b67af7db40cd3",
|
||||
"url": "https://github.com/nix-community/nixos-generators/archive/40c8d30c490414910fc63626ad1b67af7db40cd3.tar.gz",
|
||||
"hash": "0mbrkdd5dlax9lqks34wwpwxnnrrm0nra496n1391s1g84knq2ji"
|
||||
},
|
||||
"nixos-unstable": {
|
||||
"type": "Channel",
|
||||
"name": "nixos-unstable",
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre688563.bc947f541ae5/nixexprs.tar.xz",
|
||||
"hash": "1jsaxwi128fiach3dj8rdj5agqivsr4sidb8lmdnl7g07fl9x0kj"
|
||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre690827.5633bcff0c61/nixexprs.tar.xz",
|
||||
"hash": "09vghfcvmics34y6n2m7adn41y423i40ir4y63bq8jn7i5g70fwy"
|
||||
},
|
||||
"nixpkgs": {
|
||||
"type": "Channel",
|
||||
"name": "nixpkgs-unstable",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre689466.7d49afd36b55/nixexprs.tar.xz",
|
||||
"hash": "0r4zb6j8in4dk7gxciapfm49dqbdd0c7ajjzj9iy2xrrj5aj32qp"
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre691017.b69de56fac8c/nixexprs.tar.xz",
|
||||
"hash": "0z32pj0lh5ng2a6cn0qfmka8cynnygckn5615mkaxq2aplkvgzx3"
|
||||
},
|
||||
"proxmox-nixos": {
|
||||
"type": "Git",
|
||||
|
|
@ -274,9 +274,9 @@
|
|||
"repo": "proxmox-nixos"
|
||||
},
|
||||
"branch": "main",
|
||||
"revision": "7869ffc2e0db36f314fb60f1ab0087b760700b00",
|
||||
"url": "https://github.com/SaumonNet/proxmox-nixos/archive/7869ffc2e0db36f314fb60f1ab0087b760700b00.tar.gz",
|
||||
"hash": "0cam36s3ar366y41rvihjqghkdjl9a1n1wzym8p2mkar1r9x7haj"
|
||||
"revision": "950e4cccac0f942076e8558f7f9f4d496cabfb18",
|
||||
"url": "https://github.com/SaumonNet/proxmox-nixos/archive/950e4cccac0f942076e8558f7f9f4d496cabfb18.tar.gz",
|
||||
"hash": "0bhqw42ydc0jfkfqw64xsg518a1pbxnvpqw92nna7lm8mzpxm6d4"
|
||||
},
|
||||
"signal-irc-bridge": {
|
||||
"type": "Git",
|
||||
|
|
@ -296,9 +296,9 @@
|
|||
"url": "https://git.dgnum.eu/mdebray/stateless-uptime-kuma"
|
||||
},
|
||||
"branch": "master",
|
||||
"revision": "390363e6a977d71a96c53d7f8b252038dfee2e2e",
|
||||
"revision": "880f444ff7862d6127b051cf1a993ad1585b1652",
|
||||
"url": null,
|
||||
"hash": "11vvfxw2sznc155x0xlgl00g6n9sr90xa0b1hr14vchg7gkz46r5"
|
||||
"hash": "166057469hhxnyqbpd7jjlccdmigzch51616n1d5r617xg0y1mwp"
|
||||
},
|
||||
"wp4nix": {
|
||||
"type": "Git",
|
||||
|
|
@ -308,9 +308,9 @@
|
|||
"server": "https://git.helsinki.tools/"
|
||||
},
|
||||
"branch": "master",
|
||||
"revision": "4c47608f349dd45e4895e1f61f19ad9e8dfcc0bf",
|
||||
"url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=4c47608f349dd45e4895e1f61f19ad9e8dfcc0bf",
|
||||
"hash": "1pnjhbljihf2ras9lbp1f6izzxghccfygkkf2ikkahjr1vbicdbq"
|
||||
"revision": "778ebe15e8233583653ace489d69076122e8639e",
|
||||
"url": "https://git.helsinki.tools/api/v4/projects/helsinki-systems%2Fwp4nix/repository/archive.tar.gz?sha=778ebe15e8233583653ace489d69076122e8639e",
|
||||
"hash": "0r7wg0g3q9pdixvfh86z9bbshzcd7s2k7f4m7slirhyjsai5rqyd"
|
||||
}
|
||||
},
|
||||
"version": 3
|
||||
|
|
|
|||
Loading…
Reference in a new issue