tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

remove matrix-synapse.sliding-sync warn and add nextcloud apps

Browse source
This commit is contained in:
Tristan 2024-02-27 17:49:27 +00:00
parent 4c318790ac
commit f8dd1681aa
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
nixos/services/nextcloud.nix
View file

@ -36,7 +36,6 @@ in {
}; };
secretFile = sops.templates."nextcloud/secrets.json".path; secretFile = sops.templates."nextcloud/secrets.json".path;
settings = { settings = {
trusted_proxies = ["192.168.1.1" "127.0.0.1"];
maintenance_window_start = 2; maintenance_window_start = 2;
default_phone_region = "GB"; default_phone_region = "GB";
# https://github.com/pulsejet/nextcloud-oidc-login # https://github.com/pulsejet/nextcloud-oidc-login
@ -68,6 +67,20 @@ in {
oidc_login_well_known_caching_time = 86400; oidc_login_well_known_caching_time = 86400;
datadirectory = "/mnt/storage/nextcloud"; datadirectory = "/mnt/storage/nextcloud";
}; };
extraApps = {
inherit (config.services.nextcloud.package.packages.apps)
contacts calendar mail gpoddersync memories notes maps;
oidc_login = pkgs.fetchNextcloudApp {
sha256 = "sha256-cN5azlThKPKRVip14yfUNR85of5z+N6NVI7sg6pSGQI=";
url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.0.2/oidc_login.tar.gz";
license = "agpl3";
};
news = pkgs.fetchNextcloudApp {
sha256 = "sha256-aePXUn57U+1e01dntxFuzWZ8ILzwbnsAOs60Yz/6zUU=";
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha4/news.tar.gz";
license = "agpl3";
};
};
maxUploadSize = "5G"; maxUploadSize = "5G";
}; };
services.nginx.virtualHosts.${nextcloud.hostName} = { services.nginx.virtualHosts.${nextcloud.hostName} = {

6
nixos/services/synapse.nix
View file

@ -13,7 +13,7 @@
''; '';
port = 8008; port = 8008;
inherit (config) sops; inherit (config) sops;
inherit (config.services) matrix-synapse; inherit (config.services) matrix-synapse matrix-sliding-sync;
inherit (sops) secrets templates; inherit (sops) secrets templates;
in { in {
services.postgresql.enable = true; services.postgresql.enable = true;
@ -110,14 +110,14 @@ in {
}; };
locations."/_matrix".proxyPass = "http://localhost:${toString port}"; locations."/_matrix".proxyPass = "http://localhost:${toString port}";
locations."/_synapse/client".proxyPass = "http://localhost:${toString port}"; locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-synapse.sliding-sync.settings.SYNCV3_BINDADDR}"; locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
}; };
${fqdn} = { ${fqdn} = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/_matrix".proxyPass = "http://localhost:${toString port}"; locations."/_matrix".proxyPass = "http://localhost:${toString port}";
locations."/_synapse/client".proxyPass = "http://localhost:${toString port}"; locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-synapse.sliding-sync.settings.SYNCV3_BINDADDR}"; locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
}; };
}; };
} }