gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(ci): flake update

Browse source 
samba module changed significantly
This commit is contained in:
arcnmx 2024-09-14 11:47:16 -07:00
parent acb76430a4
commit 51911b37ac
6 changed files with 67 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

25
nixos/access/nextjs-ollama.nix
View file

@ -29,16 +29,17 @@ in {
enable = true;
requireAuth = false;
};
subFilterLocation = { virtualHost, ... }: mkIf (virtualHost.locations ? "/ollama/") {
proxy.headers.set.Accept-Encoding = "";
extraConfig = ''
sub_filter_once off;
sub_filter_types application/javascript;
sub_filter '${cfg.ollamaUrl}' '/ollama';
'';
};
subFilterLocation = {virtualHost, ...}:
mkIf (virtualHost.locations ? "/ollama/") {
proxy.headers.set.Accept-Encoding = "";
extraConfig = ''
sub_filter_once off;
sub_filter_types application/javascript;
sub_filter '${cfg.ollamaUrl}' '/ollama';
'';
};
proxyLocation = {
imports = [ subFilterLocation ];
imports = [subFilterLocation];
proxy = {
enable = true;
upstream = mkDefault upstreamName;
@ -49,16 +50,16 @@ in {
return = mkDefault "302 /llama/";
};
"/llama/" = {virtualHost, ...}: {
imports = [ proxyLocation ];
imports = [proxyLocation];
vouch.requireAuth = mkIf virtualHost.vouch.enable true;
proxy.path = "/";
};
"/_next/" = {virtualHost, ...}: {
imports = [ proxyLocation ];
imports = [proxyLocation];
vouch.requireAuth = mkIf virtualHost.vouch.enable true;
};
"/_next/static/" = _: {
imports = [ proxyLocation ];
imports = [proxyLocation];
};
"~ '^/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'" = {
return = mkDefault "302 /llama$request_uri";

2
nixos/kyuuto/opl.nix
View file

@ -40,7 +40,7 @@ in {
"server min protocol" = mkDefault "NT1";
"keepalive" = mkDefault 0;
};
shares.opl = let
shares'.opl = let
inherit (config.networking.access) cidrForNetwork;
in
mkIf cfg.enable {

2
nixos/kyuuto/samba.nix
View file

@ -24,7 +24,7 @@ in {
enable = mkDefault true;
path = mkDefault (kyuuto.mountDir + "/usershares");
};
shares = {
shares' = {
kyuuto-transfer = {
comment = "Kyuuto Media Transfer Area";
path = kyuuto.transferDir;

8
nixos/samba.nix
View file

@ -17,10 +17,10 @@
in {
services.samba = {
enable = mkDefault true;
enableWinbindd = mkDefault true;
enableNmbd = mkDefault true;
securityType = mkDefault "user";
# TODO: securityType = "ADS"? kerberos..!
winbindd.enable = mkDefault true;
nmbd.enable = mkDefault true;
# TODO: security = "ADS"? kerberos..!
settings.global.security = mkDefault "user";
domain = {
name = "GENSOKYO";
netbiosName = "reisen";