fix nixpkgs and trillium
This commit is contained in:
parent
9e58c21946
commit
58348b3c83
4 changed files with 19 additions and 7 deletions
|
|
@ -4,7 +4,7 @@
|
|||
}:
|
||||
let
|
||||
declaration = "services/misc/litellm.nix";
|
||||
nixpkgs = inputs.open-webui-nixpkgs;
|
||||
nixpkgs = inputs.litellm-nixpkgs;
|
||||
pkgs = import nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
let
|
||||
declaration = "services/security/oauth2-proxy.nix";
|
||||
nixpkgs = inputs.open-webui-nixpkgs;
|
||||
nixpkgs = inputs.oauth2-proxy-nixpkgs;
|
||||
pkgs = import nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
|
|
@ -40,7 +40,7 @@ in
|
|||
# show-debug-on-error = "true";
|
||||
# errors-to-info-log = "true";
|
||||
};
|
||||
cookie.refresh = "30m";
|
||||
cookie.refresh = "12h";
|
||||
# setXauthrequest = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
{
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
declaration = "services/web-apps/trilium.nix";
|
||||
nixpkgs = inputs.open-webui-nixpkgs;
|
||||
nixpkgs = inputs.trilium-nixpkgs;
|
||||
pkgs = import nixpkgs {
|
||||
system = "x86_64-linux";
|
||||
config.allowUnfree = true;
|
||||
|
|
@ -20,12 +21,23 @@ in
|
|||
port = 9111;
|
||||
host = "127.0.0.1";
|
||||
dataDir = "/var/lib/trilium";
|
||||
# NOTE using oauth2-proxy for auth, ensure that is not removed below while keeping this on
|
||||
noAuthentication = true;
|
||||
instanceName = "joshuabell";
|
||||
};
|
||||
|
||||
systemd.services.trilium-server.environment = {
|
||||
TRILIUM_NO_UPLOAD_LIMIT = "true";
|
||||
|
||||
# TRILIUM_PUBLIC_URL = "https://notes.joshuabell.xyz";
|
||||
|
||||
# TODO this did not work... sad we use oauth2-proxy instead
|
||||
# TRILIUM_OAUTH_BASE_URL = "https://notes.joshuabell.xyz";
|
||||
# TRILIUM_OAUTH_CLIENT_ID = "REPLACE";
|
||||
# TRILIUM_OAUTH_CLIENT_SECRET = "REPLACE";
|
||||
# TRILIUM_OAUTH_ISSUER_BASE_URL = "https://sso.joshuabell.xyz/.well-known/openid-configuration";
|
||||
# TRILIUM_OAUTH_ISSUER_NAME = "SSO";
|
||||
# TRILIUM_OAUTH_ISSUER_ICON = "https://cdn.jsdelivr.net/gh/selfhst/icons/svg/zitadel.svg";
|
||||
};
|
||||
|
||||
services.oauth2-proxy.nginx.virtualHosts."notes.joshuabell.xyz" = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue