X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=5dc0981ef627e979523ad7d6a7c8fd6a55aa61cb;hb=441da8aac378f401625e82caf281fa0e26128310;hp=9fb2d0357858d5a6e8a5fdc1810c8912db540ff5;hpb=ea9c6fe8041faab128391a0c03ec3bde25e29fa3;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 9fb2d03..5dc0981 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix @@ -35,6 +35,9 @@ let inherit (pkgs.webapps) phpldapadmin; env = config.myEnv.tools.phpldapadmin; }; + grocy = pkgs.callPackage ./grocy.nix { + inherit (pkgs.webapps) grocy; + }; cfg = config.myServices.websites.tools.tools; in { @@ -53,6 +56,7 @@ in { services.duplyBackup.profiles = { dokuwiki = dokuwiki.backups; + grocy = grocy.backups; kanboard = kanboard.backups; rompr = rompr.backups; shaarli = shaarli.backups; @@ -125,6 +129,7 @@ in { dokuwiki.apache.vhostConf ldap.apache.vhostConf kanboard.apache.vhostConf + grocy.apache.vhostConf ]; }; @@ -219,59 +224,92 @@ in { paths = [ "/var/secrets/mpd" ]; }; - services.phpfpm.pools.devtools = { - listen = "/var/run/phpfpm/devtools.sock"; - extraConfig = '' - user = wwwrun - group = wwwrun - listen.owner = wwwrun - listen.group = wwwrun - pm = dynamic - pm.max_children = 60 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 10 - - php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp" - ''; - phpOptions = config.services.phpfpm.phpOptions + '' - extension=${pkgs.php}/lib/php/extensions/mysqli.so - 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 - ''; - }; + services.phpfpm.pools = { + tools = { + listen = "/var/run/phpfpm/tools.sock"; + extraConfig = '' + user = wwwrun + group = wwwrun + listen.owner = wwwrun + listen.group = wwwrun + pm = dynamic + pm.max_children = 60 + pm.start_servers = 2 + pm.min_spare_servers = 1 + pm.max_spare_servers = 10 - services.phpfpm.poolConfigs = { - adminer = adminer.phpFpm.pool; - ttrss = ttrss.phpFpm.pool; - wallabag = wallabag.phpFpm.pool; - yourls = yourls.phpFpm.pool; - rompr = rompr.phpFpm.pool; - shaarli = shaarli.phpFpm.pool; - dokuwiki = dokuwiki.phpFpm.pool; - ldap = ldap.phpFpm.pool; - kanboard = kanboard.phpFpm.pool; - tools = '' - listen = /var/run/phpfpm/tools.sock - user = wwwrun - group = wwwrun - listen.owner = wwwrun - listen.group = wwwrun - pm = dynamic - pm.max_children = 60 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 10 + ; Needed to avoid clashes in browser cookies (same domain) + php_value[session.name] = ToolsPHPSESSID + php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp" + ''; + }; + devtools = { + listen = "/var/run/phpfpm/devtools.sock"; + extraConfig = '' + user = wwwrun + group = wwwrun + listen.owner = wwwrun + listen.group = wwwrun + pm = dynamic + pm.max_children = 60 + pm.start_servers = 2 + pm.min_spare_servers = 1 + pm.max_spare_servers = 10 - ; Needed to avoid clashes in browser cookies (same domain) - php_value[session.name] = ToolsPHPSESSID - php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp" - ''; + php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp" + ''; + phpOptions = config.services.phpfpm.phpOptions + '' + extension=${pkgs.php}/lib/php/extensions/mysqli.so + 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 + ''; + }; + adminer = { + listen = adminer.phpFpm.socket; + extraConfig = adminer.phpFpm.pool; + }; + ttrss = { + listen = ttrss.phpFpm.socket; + extraConfig = ttrss.phpFpm.pool; + }; + wallabag = { + listen = wallabag.phpFpm.socket; + extraConfig = wallabag.phpFpm.pool; + }; + yourls = { + listen = yourls.phpFpm.socket; + extraConfig = yourls.phpFpm.pool; + }; + rompr = { + listen = rompr.phpFpm.socket; + extraConfig = rompr.phpFpm.pool; + }; + shaarli = { + listen = shaarli.phpFpm.socket; + extraConfig = shaarli.phpFpm.pool; + }; + dokuwiki = { + listen = dokuwiki.phpFpm.socket; + extraConfig = dokuwiki.phpFpm.pool; + }; + ldap = { + listen = ldap.phpFpm.socket; + extraConfig = ldap.phpFpm.pool; + }; + kanboard = { + listen = kanboard.phpFpm.socket; + extraConfig = kanboard.phpFpm.pool; + }; + grocy = { + listen = grocy.phpFpm.socket; + extraConfig = grocy.phpFpm.pool; + }; }; system.activationScripts = { adminer = adminer.activationScript; + grocy = grocy.activationScript; ttrss = ttrss.activationScript; wallabag = wallabag.activationScript; yourls = yourls.activationScript; @@ -292,6 +330,7 @@ in { "${wallabag.apache.webappName}" = wallabag.webRoot; "${yourls.apache.webappName}" = yourls.webRoot; "${kanboard.apache.webappName}" = kanboard.webRoot; + "${grocy.apache.webappName}" = grocy.webRoot; }; services.websites.env.tools.watchPaths = [