diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2021-01-09 11:57:09 -0500 |
|---|---|---|
| committer | Manuel Bärenz <programming@manuelbaerenz.de> | 2021-01-27 11:05:07 +0100 |
| commit | f72c123b6e94a7af1f2ed7e3391b8f786773582d (patch) | |
| tree | 45591fb80ed938f9584d9f9d1343fa4367b70fbf | |
| parent | 434a2783b80a799c5abddb71d9ea8945c9750f5e (diff) | |
| download | nixpkgs-f72c123b6e94a7af1f2ed7e3391b8f786773582d.tar nixpkgs-f72c123b6e94a7af1f2ed7e3391b8f786773582d.tar.gz nixpkgs-f72c123b6e94a7af1f2ed7e3391b8f786773582d.tar.bz2 nixpkgs-f72c123b6e94a7af1f2ed7e3391b8f786773582d.tar.lz nixpkgs-f72c123b6e94a7af1f2ed7e3391b8f786773582d.tar.xz nixpkgs-f72c123b6e94a7af1f2ed7e3391b8f786773582d.tar.zst nixpkgs-f72c123b6e94a7af1f2ed7e3391b8f786773582d.zip | |
nixos/nextcloud: remove duplicate php.ini entries
| -rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 448522ad5e8..a2d6d48fd40 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -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"; |