nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/nextcloud: remove duplicate php.ini entries

Browse Source
This commit is contained in:
Aaron Andersen 2021-01-09 11:57:09 -05:00 committed by Manuel Bärenz
parent 434a2783b8
commit f72c123b6e
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -11,7 +11,7 @@ let
enabled
++ (with all; [ apcu redis memcached imagick ]) # Necessary for vanilla nextcloud
++ cfg.phpExtraExtensions all; # Enabled by user
extraConfig = phpOptionsStr;
extraConfig = toKeyValue phpOptions;
};
toKeyValue = generators.toKeyValue {
@ -23,7 +23,6 @@ let
post_max_size = cfg.maxUploadSize;
memory_limit = cfg.maxUploadSize;
} // cfg.phpOptions;
phpOptionsStr = toKeyValue phpOptions;
occ = pkgs.writeScriptBin "nextcloud-occ" ''
#! ${pkgs.runtimeShell}
@ -522,7 +521,6 @@ in {
pools.nextcloud = {
user = "nextcloud";
group = "nextcloud";
phpOptions = phpOptionsStr;
phpPackage = phpPackage;
phpEnv = {
NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";