diff --git a/nixosModules/server/memos.nix b/nixosModules/server/memos.nix index 1fba9fc..0436151 100644 --- a/nixosModules/server/memos.nix +++ b/nixosModules/server/memos.nix @@ -8,18 +8,18 @@ enable = true; openFirewall = true; settings = { - MEMOS_MODE = "prod"; - MEMOS_ADDR = "0.0.0.0"; - MEMOS_PORT = "5230"; - MEMOS_DATA = config.services.memos.dataDir; - MEMOS_DRIVER = "sqlite"; - MEMOS_INSTANCE_URL = "http://0.0.0.0:5230"; + MEMOS_MODE = "prod"; + MEMOS_ADDR = "0.0.0.0"; + MEMOS_PORT = "5230"; + MEMOS_DATA = config.services.memos.dataDir; + MEMOS_DRIVER = "sqlite"; + MEMOS_INSTANCE_URL = "http://0.0.0.0:5230"; }; # user = "${xlib.device.username}"; # group = "users"; dataDir = "/mnt/services/memos"; }; - + systemd.tmpfiles.rules = [ "z /mnt/services/memos 0750 memos memos -" ]; diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix index da50fcf..03f4a59 100755 --- a/nixosModules/server/nextcloud.nix +++ b/nixosModules/server/nextcloud.nix @@ -7,7 +7,10 @@ ... }: let - stable = import inputs.nixpkgs-stable { system = "x86_64-linux"; }; + stable = import inputs.nixpkgs-stable { + system = "x86_64-linux"; + config.allowUnfree = true; + }; in { services = { diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix index 44afbbb..9f7ac09 100755 --- a/nixosModules/server/nginx.nix +++ b/nixosModules/server/nginx.nix @@ -41,7 +41,7 @@ # } # ]; # }; - "onlyoffice" = { + "onlyoffice.local" = { forceSSL = false; enableACME = false; listen = [ @@ -54,6 +54,12 @@ port = 8000; } ]; + extraConfig = '' + # Force nginx to return relative redirects. This lets the browser + # figure out the full URL. This ends up working better because it's in + # front of the reverse proxy and has the right protocol, hostname & port. + absolute_redirect off; + ''; }; # "localhost:9980" = { # forceSSL = false; diff --git a/nixosModules/server/trilium.nix b/nixosModules/server/trilium.nix index 5fa6bd5..490ffea 100644 --- a/nixosModules/server/trilium.nix +++ b/nixosModules/server/trilium.nix @@ -13,7 +13,7 @@ host = "0.0.0.0"; dataDir = "/mnt/services/trilium"; }; - + systemd.tmpfiles.rules = [ "z /mnt/services/trilium 0750 trilium trilium -" ];