Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma owncloud: use php.buildEnv

Browse Source
This commit is contained in:
makefu 2020-11-17 22:23:05 +01:00
parent 9e6167a553
commit 60e1c9a6a7
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
makefu/2configs/deployment/owncloud.nix
View File

@ -14,8 +14,18 @@ with lib;
let let
phpPackage = let
base = pkgs.php74;
in
base.buildEnv {
extensions = { enabled, all }: with all;
enabled ++ [
apcu redis memcached imagick
];
};
# TODO: copy-paste from lass/2/websites/util.nix # TODO: copy-paste from lass/2/websites/util.nix
nextcloud = pkgs.nextcloud18; nextcloud = pkgs.nextcloud20;
serveCloud = domains: serveCloud = domains:
let let
domain = head domains; domain = head domains;
@ -126,6 +136,7 @@ let
services.phpfpm.pools."${domain}" = { services.phpfpm.pools."${domain}" = {
user = "nginx"; user = "nginx";
group = "nginx"; group = "nginx";
phpPackage = phpPackage;
settings = { settings = {
"listen.owner" = "nginx"; "listen.owner" = "nginx";
"pm" = "dynamic"; "pm" = "dynamic";
@ -138,7 +149,7 @@ let
"php_admin_flag[log_errors]" = "on"; "php_admin_flag[log_errors]" = "on";
"catch_workers_output" = true; "catch_workers_output" = true;
}; };
phpEnv."PATH" = lib.makeBinPath [ pkgs.php ]; phpEnv."PATH" = lib.makeBinPath [ phpPackage ];
}; };
services.phpfpm.phpOptions = '' services.phpfpm.phpOptions = ''
opcache.enable=1 opcache.enable=1
@ -149,7 +160,7 @@ let
opcache.save_comments=1 opcache.save_comments=1
opcache.revalidate_freq=1 opcache.revalidate_freq=1
opcache.file_cache = .opcache opcache.file_cache = .opcache
zend_extension=${pkgs.php}/lib/php/extensions/opcache.so zend_extension=${phpPackage}/lib/php/extensions/opcache.so
display_errors = on display_errors = on
display_startup_errors = on display_startup_errors = on
@ -157,13 +168,15 @@ let
error_reporting = E_ALL | E_STRICT error_reporting = E_ALL | E_STRICT
html_errors = On html_errors = On
date.timezone = "Europe/Berlin" date.timezone = "Europe/Berlin"
extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so extension=${phpPackage}/lib/php/extensions/memcached.so
extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so extension=${phpPackage}/lib/php/extensions/redis.so
''; # extension=${pkgs.phpPackages.memcached}/lib/php/extensions/memcached.so extension=${phpPackage}/lib/php/extensions/apcu.so
'';
systemd.services."nextcloud-cron-${domain}" = { systemd.services."nextcloud-cron-${domain}" = {
serviceConfig = { serviceConfig = {
User = "nginx"; User = "nginx";
ExecStart = "${pkgs.php}/bin/php -f ${root}/cron.php"; ExecStart = "${phpPackage}/bin/php -f ${root}/cron.php";
}; };
startAt = "*:0/15"; startAt = "*:0/15";
}; };