X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fcloud%2Fdefault.nix;h=e6f8ecb8a1b0e296f38192d919d24fb3280cb06f;hb=c4216ddb8bedd0b75149c039bd5dc86c3d6a9b7f;hp=ceb8f77203f4c121405ad58f0927cdaf5ed2614c;hpb=4288c2f2431fb782b0d512b1b3749187f2374b6a;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index ceb8f77..e6f8ecb 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix @@ -1,46 +1,41 @@ -{ 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 = { @@ -48,9 +43,10 @@ in { }; config = lib.mkIf cfg.enable { - services.websites.tools.modules = [ "proxy_fcgi" ]; + # FIXME: find a way to backup the data + services.websites.env.tools.modules = [ "proxy_fcgi" ]; - services.websites.tools.vhostConfs.cloud = { + services.websites.env.tools.vhostConfs.cloud = { certName = "eldiron"; addToCerts = true; hosts = ["cloud.immae.eu" ]; @@ -70,7 +66,7 @@ in { CGIPassAuth on - SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" + SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost" @@ -83,8 +79,10 @@ in { user = "wwwrun"; group = "wwwrun"; permissions = "0600"; + # This file is not actually included, see activationScript below text = '' '${env.instance_id}1', @@ -92,7 +90,7 @@ in { '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_', @@ -128,7 +126,7 @@ in { 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, @@ -143,8 +141,8 @@ in { 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 ]; @@ -160,7 +158,7 @@ in { ${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 @@ -170,17 +168,24 @@ in { ''; 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(e: pkgs.php74.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); }; services.cron = { enable = true; - systemCronJobs = [ + systemCronJobs = let + script = pkgs.writeScriptBin "nextcloud-cron" '' + #! ${pkgs.stdenv.shell} + export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive + export PATH=/run/wrappers/bin:$PATH + ${pkgs.php74}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php + ''; + in [ '' - LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive - */15 * * * * wwwrun ${pkgs.php}/bin/php -f ${nextcloud}/cron.php + */15 * * * * wwwrun ${script}/bin/nextcloud-cron '' ]; };