diff --git a/flake.lock b/flake.lock index 69753360..47e5aab9 100644 --- a/flake.lock +++ b/flake.lock @@ -1815,7 +1815,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-tpoeaZxzGIo1bv/ddxX7qW6RZJEn7kf3ZhnIH4BvJ9o=", + "narHash": "sha256-zBrA+662PqLuRrkX7nGzewiOyWnhj3eZ1MKP050fbvM=", "path": "./neovim", "type": "path" }, diff --git a/nixos/mirai/configuration.nix b/nixos/mirai/configuration.nix index 070b2f2f..b304af43 100644 --- a/nixos/mirai/configuration.nix +++ b/nixos/mirai/configuration.nix @@ -18,7 +18,7 @@ owner = config.users.users.nextcloud.name; }; sops.secrets."llama/user" = { - # owner = config.users.services.llama-cpp.name; + owner = config.users.users.caddy.name; }; # Use the systemd-boot EFI boot loader. diff --git a/nixos/mirai/services.nix b/nixos/mirai/services.nix index 85fb22cb..cf713a7b 100644 --- a/nixos/mirai/services.nix +++ b/nixos/mirai/services.nix @@ -63,10 +63,10 @@ reverse_proxy localhost:8080 ''; virtualHosts."llama.darksailor.dev".extraConfig = '' - reverse_proxy / localhost:3000 basic_auth /* { - import htpasswd ${config.sops.secrets."llama/user".path} + import ${config.sops.secrets."llama/user".path} } + reverse_proxy localhost:3000 ''; }; } diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index ca759850..efd349b2 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,7 +1,7 @@ nextcloud: adminpass: ENC[AES256_GCM,data:v9WXJ3Ig5NcWd+02P8VnaNkMy2yfEQ==,iv:LfS0avmRZfjdqjNE69h7L90ePzzdmtP57X+0U1vAMvs=,tag:Dq90tfGAUyqzTW3oM96IRg==,type:str] llama: - user: ENC[AES256_GCM,data:ig6DC0oTL5ASh6eBIRr2MjKjr1H8I+GOtEd4hD5QOjIb+9XSxWzNPEImDBy5,iv:AH+8QuGRNYveVMiM2Tnu2vP9KA0v5NhqoxjGjhPXoR4=,tag:yswGFV/EpPvB4ASnNH9EWQ==,type:str] + user: ENC[AES256_GCM,data:qWbhnc/XLotWzqbEa6ekuMe5kD/GwC9SW8omXvgWqCG1BPPCOI3DtlS4YqKxsIhYmw8MQw+4DPnaWHqjrbIsVSrQ79M=,iv:VeqkKb1N9NSKfuilG6dzYdha8cO4JqJ+YUzmkjrPU+0=,tag:SYwR1oU6VWzNoCBPsMg0uQ==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +17,8 @@ sops: VGZKdHpVeFRpQUxtSEkyaEhLMlBJcGsKLb0DvPNZosPBUuiX6qz1s5IO5INQh8CK ZtXTVClwMSmaUYhdSB2gKFrKVZHXTJZ4oAL5t/BpC0pOHyr+o96T3Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-11-22T08:57:58Z" - mac: ENC[AES256_GCM,data:anG00AmaO5cKTp/uIKPMw296e3cuNKq0oijvqi54V1F3kULbU5oNCHHvgnRXeBWH9lmHW6uaoV+4sP58zSWHI2njE258EXThnZgBGR30lj+Trf2WY7w7EgzKtytlNngsK/1qfsA/E8OQ58+pLfLoXbxvFYniSCkMDvSmlKOMAj0=,iv:zkJjQGGNq+5gP3FP9FA3D0g0JrJwGG/JcxVmZL/PJsE=,tag:ZjyRoQhVgqAXgaNCAey3mQ==,type:str] + lastmodified: "2024-11-22T09:40:57Z" + mac: ENC[AES256_GCM,data:Y8D5L9EjuXw5tKx4RE8Kk+upfrp1Rq+KSL86enpuftLIxiAodedBAbxEqPO4vQshtUAorjj6AT1QF97L+OtfyKxVsicxar04beERe3xSNub71wrHAJ7sLSfB03ybpkZDEkmm8zpjEFoqFBg4HoMXLj3bNvaUQwrJ5lRs6XpCKOM=,iv:Hfuan61vWdTqblfGu+H/sBfw5x8Vxsg3MN4eNCPE1+M=,tag:3TEmXLqLitzPjLEMEN5l4g==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1