waffentrager: update nextcloud

This commit is contained in:
Mateusz Słodkowicz 2024-06-17 13:41:18 +02:00
parent 7d90f5f210
commit d9c5af566b
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
3 changed files with 8 additions and 8 deletions

View File

@ -48,7 +48,7 @@
nix = { nix = {
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" "repl-flake" "no-url-literals" ]; experimental-features = [ "nix-command" "flakes" "no-url-literals" ];
trusted-users = [ "root" "@wheel" ]; trusted-users = [ "root" "@wheel" ];
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"

View File

@ -22,14 +22,12 @@
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
notify_push.enable = true; notify_push.enable = true;
package = pkgs.nextcloud28; package = pkgs.nextcloud29;
hostName = "waffentrager.materus.pl"; hostName = "waffentrager.materus.pl";
home = config.waffentragerService.elements.nextcloudDir; home = config.waffentragerService.elements.nextcloudDir;
config.adminuser = "master"; config.adminuser = "master";
config.adminpassFile = config.sops.secrets.nextcloud-adminpass.path; config.adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
config.dbtype = "pgsql"; config.dbtype = "pgsql";
config.defaultPhoneRegion = "PL";
config.trustedProxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ];
extraAppsEnable = true; extraAppsEnable = true;
maxUploadSize = "4G"; maxUploadSize = "4G";
https = true; https = true;
@ -39,10 +37,13 @@
appstoreEnable = true; appstoreEnable = true;
database.createLocally = true; database.createLocally = true;
nginx.recommendedHttpHeaders = true; nginx.recommendedHttpHeaders = true;
extraApps = with pkgs.nextcloud28Packages.apps; { extraApps = with pkgs.nextcloud29Packages.apps; {
inherit notify_push previewgenerator; inherit notify_push previewgenerator;
}; };
extraOptions = { settings = {
"profile.enabled" = true;
default_phone_region = "PL";
trusted_proxies = [ materusArg.ips.valkyrie materusArg.ips.wireguard.valkyrie materusArg.ips.wireguard.waffentrager ];
mail_smtpmode = "sendmail"; mail_smtpmode = "sendmail";
mail_sendmailmode = "pipe"; mail_sendmailmode = "pipe";
enable_previews = true; enable_previews = true;
@ -66,7 +67,6 @@
]; ];
"overwrite.cli.url" = "https://${config.services.nextcloud.hostName}"; "overwrite.cli.url" = "https://${config.services.nextcloud.hostName}";
}; };
globalProfiles = true;
phpOptions = { phpOptions = {
"opcache.memory_consumption" = "512"; "opcache.memory_consumption" = "512";

View File

@ -7,7 +7,7 @@ in
config.nix = lib.mkIf cfg.enable { config.nix = lib.mkIf cfg.enable {
settings = { settings = {
experimental-features = lib.mkMerge [[ "nix-command" "flakes" "no-url-literals" ] (lib.mkIf (materusCfg.stable) ["repl-flake"])]; experimental-features = lib.mkMerge [[ "nix-command" "flakes" "no-url-literals" ]];
auto-optimise-store = true; auto-optimise-store = true;
trusted-users = [ "root" "@wheel" ]; trusted-users = [ "root" "@wheel" ];