-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
- nextcloud = pkgs.webapps.nextcloud.withApps (builtins.attrValues pkgs.webapps.nextcloud-apps);
- env = myconfig.env.tools.nextcloud;
+ nextcloud = pkgs.webapps.nextcloud.withApps (a: [
+ a.apporder a.audioplayer a.bookmarks a.calendar a.carnet a.contacts
+ a.cookbook a.deck a.extract a.files_markdown a.files_readmemd
+ a.flowupload a.gpxedit a.gpxpod a.keeweb a.maps a.metadata a.music
+ a.notes a.ocsms a.passman a.polls a.spreed a.tasks
+ ]);
+ env = config.myEnv.tools.nextcloud;
varDir = "/var/lib/nextcloud";
webappName = "tools_nextcloud";
apacheRoot = "/run/current-system/webapps/${webappName}";
cfg = config.myServices.websites.tools.cloud;
phpFpm = rec {
- basedir = builtins.concatStringsSep ":" (
- [ nextcloud varDir ]
- ++ builtins.attrValues pkgs.webapps.nextcloud-apps);
- socket = "/var/run/phpfpm/nextcloud.sock";
- phpConfig = ''
- extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
- extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
- zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
- '';
- pool = ''
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
- pm = ondemand
- pm.max_children = 60
- pm.process_idle_timeout = 60
+ basedir = builtins.concatStringsSep ":" ([ nextcloud varDir ] ++ nextcloud.apps);
+ pool = {
+ "listen.owner" = "wwwrun";
+ "listen.group" = "wwwrun";
+ "pm" = "ondemand";
+ "pm.max_children" = "60";
+ "pm.process_idle_timeout" = "60";
- php_admin_value[output_buffering] = 0
- php_admin_value[max_execution_time] = 1800
- php_admin_value[zend_extension] = "opcache"
- ;already enabled by default?
- ;php_value[opcache.enable] = 1
- php_value[opcache.enable_cli] = 1
- php_value[opcache.interned_strings_buffer] = 8
- php_value[opcache.max_accelerated_files] = 10000
- php_value[opcache.memory_consumption] = 128
- php_value[opcache.save_comments] = 1
- php_value[opcache.revalidate_freq] = 1
- php_admin_value[memory_limit] = 512M
+ "php_admin_value[output_buffering]" = "0";
+ "php_admin_value[max_execution_time]" = "1800";
+ "php_admin_value[zend_extension]" = "opcache";
+ #already enabled by default?
+ #"php_value[opcache.enable]" = "1";
+ "php_value[opcache.enable_cli]" = "1";
+ "php_value[opcache.interned_strings_buffer]" = "8";
+ "php_value[opcache.max_accelerated_files]" = "10000";
+ "php_value[opcache.memory_consumption]" = "128";
+ "php_value[opcache.save_comments]" = "1";
+ "php_value[opcache.revalidate_freq]" = "1";
+ "php_admin_value[memory_limit]" = "512M";
- php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp"
- php_admin_value[session.save_path] = "${varDir}/phpSessions"
- '';
+ "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp";
+ "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
+ };
};
in {
options.myServices.websites.tools.cloud = {
</IfModule>
<FilesMatch "\.php$">
CGIPassAuth on
- SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost"
</FilesMatch>
</Directory>
user = "wwwrun";
group = "wwwrun";
permissions = "0600";
+ # This file is not actually included, see activationScript below
text = ''
<?php
+ include('${nextcloud}/version.php');
$CONFIG = array (
// FIXME: change this value when nextcloud starts getting slow
'instanceid' => '${env.instance_id}1',
'passwordsalt' => '${env.password_salt}',
'debug' => false,
'dbtype' => 'pgsql',
- 'version' => '16.0.0.9',
+ 'version' => implode($OC_Version, '.'),
'dbname' => '${env.postgresql.database}',
'dbhost' => '${env.postgresql.socket}',
'dbtableprefix' => 'oc_',
array (
'host' => '${env.redis.socket}',
'port' => 0,
- 'dbindex' => ${env.redis.db_index},
+ 'dbindex' => ${env.redis.db},
),
'overwrite.cli.url' => 'https://cloud.immae.eu',
'ldapIgnoreNamingRules' => false,
cd ${nextcloud}
NEXTCLOUD_CONFIG_DIR="${nextcloud}/config" \
exec \
- sudo -u wwwrun ${pkgs.php}/bin/php \
- -c ${pkgs.php}/etc/php.ini \
+ sudo -u wwwrun ${pkgs.php74}/bin/php \
+ -c ${pkgs.php74}/etc/php.ini \
occ $*
'';
in [ occ ];
${builtins.concatStringsSep "\n" (lib.attrsets.mapAttrsToList (n: v:
"install -D -m 0644 -o wwwrun -g wwwrun -T ${v} ${varDir}/config/${n}.json"
) confs)}
- install -D -m 0600 -o wwwrun -g wwwrun -T /var/secrets/webapps/tools-nextcloud ${varDir}/config/config.php
+ #install -D -m 0600 -o wwwrun -g wwwrun -T /var/secrets/webapps/tools-nextcloud ${varDir}/config/config.php
'';
};
# FIXME: add a warning when config.php changes
'';
services.phpfpm.pools.nextcloud = {
- listen = phpFpm.socket;
- extraConfig = phpFpm.pool;
- phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = phpFpm.pool;
+ phpPackage = pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache ]);
};
services.cron = {
#! ${pkgs.stdenv.shell}
export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
export PATH=/run/wrappers/bin:$PATH
- ${pkgs.php}/bin/php -f ${nextcloud}/cron.php
+ ${pkgs.php74}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php
'';
in [
''