diff options
author | talyz <kim.lindberger@gmail.com> | 2020-03-30 19:34:21 +0200 |
---|---|---|
committer | talyz <kim.lindberger@gmail.com> | 2020-04-05 16:44:42 +0200 |
commit | ed20aae86c4538ce2d2bf35515bb660de9a02fb9 (patch) | |
tree | fe0e206d0a0b8d56c980f8e2e5ac6916388d5083 /nixos/modules | |
parent | fe4d173cb2b2c8d3d3138b5d2ee2fb5f64aabbc7 (diff) |
nixos/nextcloud: Get nextcloud working
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 087bd0e5df3e..d58a7d7c4514 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,27 +6,27 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; - phpPackage = pkgs.php73; - phpPackages = pkgs.php73Packages; + phpPackage = pkgs.php73.buildEnv { + exts = pp: with pp.exts; [ + bcmath calendar curl exif ftp filter gd gettext gmp intl json ldap + mysqlnd opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql + pdo_sqlite pgsql readline session soap sodium sqlite3 zip zlib mbstring + posix hash ctype dom simplexml xmlreader xmlwriter pp.apcu + pp.redis pp.memcached pp.imagick + ]; + extraConfig = phpOptionsStr; + }; toKeyValue = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault {} " = "; }; - phpOptionsExtensions = '' - ${optionalString cfg.caching.apcu "extension=${phpPackages.apcu}/lib/php/extensions/apcu.so"} - ${optionalString cfg.caching.redis "extension=${phpPackages.redis}/lib/php/extensions/redis.so"} - ${optionalString cfg.caching.memcached "extension=${phpPackages.memcached}/lib/php/extensions/memcached.so"} - extension=${phpPackages.imagick}/lib/php/extensions/imagick.so - zend_extension = opcache.so - opcache.enable = 1 - ''; phpOptions = { upload_max_filesize = cfg.maxUploadSize; post_max_size = cfg.maxUploadSize; memory_limit = cfg.maxUploadSize; } // cfg.phpOptions; - phpOptionsStr = phpOptionsExtensions + (toKeyValue phpOptions); + phpOptionsStr = toKeyValue phpOptions; occ = pkgs.writeScriptBin "nextcloud-occ" '' #! ${pkgs.stdenv.shell} @@ -38,7 +38,6 @@ let export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" $sudo \ ${phpPackage}/bin/php \ - -c ${pkgs.writeText "php.ini" phpOptionsStr}\ occ $* ''; |