From 54d97019c035ccccceb53fb8531d1bc8bea5816a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 22 May 2021 01:00:39 +0200 Subject: [PATCH] Add files for ressourcerie --- modules/private/default.nix | 5 + modules/private/websites/bakeer/cloud.nix | 98 +------------- modules/private/websites/default.nix | 4 + .../websites/ressourcerie_banon/cloud.nix | 20 +++ .../websites/ressourcerie_banon/cryptpad.nix | 33 +++++ .../ressourcerie_banon/production.nix | 70 ++++++++++ modules/private/websites/tools/cloud/farm.nix | 123 ++++++++++++++++++ 7 files changed, 258 insertions(+), 95 deletions(-) create mode 100644 modules/private/websites/ressourcerie_banon/cloud.nix create mode 100644 modules/private/websites/ressourcerie_banon/cryptpad.nix create mode 100644 modules/private/websites/ressourcerie_banon/production.nix create mode 100644 modules/private/websites/tools/cloud/farm.nix diff --git a/modules/private/default.nix b/modules/private/default.nix index 8542e20..f12fc48 100644 --- a/modules/private/default.nix +++ b/modules/private/default.nix @@ -71,6 +71,10 @@ set = { piedsjalouxInte = ./websites/piedsjaloux/integration.nix; piedsjalouxProd = ./websites/piedsjaloux/production.nix; + ressourcerieBanonProd = ./websites/ressourcerie_banon/production.nix; + ressourcerieBanonCloud = ./websites/ressourcerie_banon/cloud.nix; + ressourcerieBanonCryptpad = ./websites/ressourcerie_banon/cryptpad.nix; + richieProd = ./websites/richie/production.nix; sydenPeertube = ./websites/syden/peertube.nix; @@ -80,6 +84,7 @@ set = { # Tools assetsTools = ./websites/tools/assets; cloudTool = ./websites/tools/cloud; + cloudFarmTool = ./websites/tools/cloud/farm.nix; commentoTool = ./websites/tools/commento; davTool = ./websites/tools/dav; vpnTool = ./websites/tools/vpn; diff --git a/modules/private/websites/bakeer/cloud.nix b/modules/private/websites/bakeer/cloud.nix index 001ca03..bf78317 100644 --- a/modules/private/websites/bakeer/cloud.nix +++ b/modules/private/websites/bakeer/cloud.nix @@ -1,69 +1,12 @@ { lib, pkgs, config, ... }: let cfg = config.myServices.websites.bakeer.cloud; - varDir = "/var/lib/nextcloud_farm/bakeer"; - apacheUser = config.services.httpd.Prod.user; - apacheGroup = config.services.httpd.Prod.group; - nextcloud = (pkgs.webapps.nextcloud.override { varDir = null; }).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.impersonate a.keeweb a.maps - a.metadata a.music a.notes a.ocsms a.passman a.polls a.spreed - a.tasks - ]); - phpBaseDir = builtins.concatStringsSep ":" ([ nextcloud varDir ] ++ nextcloud.apps); + nextcloud = config.myServices.tools.cloud.farm.package; in { options.myServices.websites.bakeer.cloud.enable = lib.mkEnableOption "enable Bakeer’s cloud"; config = lib.mkIf cfg.enable { - system.activationScripts.bakeer_cloud = { - deps = [ "httpd" ]; - text = '' - install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir} - install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/nextcloud_farm/phpSessions - ''; - }; - systemd.services.phpfpm-nextcloud_farm.after = lib.mkAfter [ "postgresql.service" ]; - systemd.services.phpfpm-nextcloud_farm.wants = [ "postgresql.service" ]; - services.phpfpm.pools.nextcloud_farm = { - user = apacheUser; - group = apacheGroup; - settings = { - "listen.owner" = apacheUser; - "listen.group" = apacheGroup; - "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[open_basedir]" = "/run/wrappers/bin/sendmail:${phpBaseDir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp"; - "php_admin_value[session.save_path]" = "/var/lib/nextcloud_farm/phpSessions"; - }; - phpPackage = pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache ]); - }; - users.users.root.packages = let - occ = pkgs.writeScriptBin "nextcloud-occ-bakeer" '' - #! ${pkgs.stdenv.shell} - cd ${nextcloud} - NEXTCLOUD_CONFIG_DIR="${varDir}" \ - exec \ - sudo -E -u wwwrun ${pkgs.php74}/bin/php \ - -c ${pkgs.php74}/etc/php.ini \ - occ $* - ''; - in [ occ ]; + myServices.tools.cloud.farm.instances = [ "bakeer" ]; services.websites.env.production.modules = [ "proxy_fcgi" ]; services.websites.env.production.vhostConfs.bakeer = { certName = "bakeer"; @@ -72,42 +15,7 @@ in { hosts = ["bakeer.immae.eu" "baxsolution.immae.eu"]; root = nextcloud; extraConfig = [ - '' - SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 - SetEnv NEXTCLOUD_CONFIG_DIR "${varDir}" - - AcceptPathInfo On - DirectoryIndex index.php - Options FollowSymlinks - Require all granted - AllowOverride all - - - Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains; preload" - - - CGIPassAuth on - SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud_farm.socket}|fcgi://localhost" - - - - '' - ]; - }; - services.cron = { - enable = true; - 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 - export NEXTCLOUD_CONFIG_DIR="${varDir}" - ${pkgs.php74}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php - ''; - in [ - '' - */15 * * * * wwwrun ${script}/bin/nextcloud-cron - '' + config.myServices.tools.cloud.farm.vhosts.bakeer ]; }; }; diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index bacfb53..b0c7496 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix @@ -292,6 +292,10 @@ in production.enable = true; }; + ressourcerie_banon.production.enable = true; + ressourcerie_banon.cryptpad.enable = true; + ressourcerie_banon.cloud.enable = true; + richie.production.enable = true; syden.peertube.enable = true; diff --git a/modules/private/websites/ressourcerie_banon/cloud.nix b/modules/private/websites/ressourcerie_banon/cloud.nix new file mode 100644 index 0000000..5179218 --- /dev/null +++ b/modules/private/websites/ressourcerie_banon/cloud.nix @@ -0,0 +1,20 @@ +{ lib, pkgs, config, ... }: +let + cfg = config.myServices.websites.ressourcerie_banon.cloud; + nextcloud = config.myServices.tools.cloud.farm.package; +in { + options.myServices.websites.ressourcerie_banon.cloud.enable = lib.mkEnableOption "enable Ressourcerie Banon’s cloud"; + + config = lib.mkIf cfg.enable { + myServices.tools.cloud.farm.instances = [ "ressourcerie_banon" ]; + services.websites.env.production.modules = [ "proxy_fcgi" ]; + services.websites.env.production.vhostConfs.ressourcerie_banon_cloud = { + certName = "ressourcerie_banon"; + addToCerts = true; + hosts = ["cloud.le-garage-autonome.org"]; + root = nextcloud; + extraConfig = [ config.myServices.tools.cloud.farm.vhosts.ressourcerie_banon ]; + }; + }; +} + diff --git a/modules/private/websites/ressourcerie_banon/cryptpad.nix b/modules/private/websites/ressourcerie_banon/cryptpad.nix new file mode 100644 index 0000000..961302d --- /dev/null +++ b/modules/private/websites/ressourcerie_banon/cryptpad.nix @@ -0,0 +1,33 @@ +{ lib, pkgs, config, ... }: +let + cfg = config.myServices.websites.ressourcerie_banon.cryptpad; + configFile = "${pkgs.cryptpad}/lib/node_modules/cryptpad/config/config.example.js"; +in { + options.myServices.websites.ressourcerie_banon.cryptpad.enable = lib.mkEnableOption "Enable Ressourcerie Banon’s cryptpad"; + + config = lib.mkIf cfg.enable { + systemd.services.cryptpad-ressourcerie_banon = { + description = "Cryptpad Banon Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "networking.target" ]; + serviceConfig = { + DynamicUser = true; + Environment = [ + "CRYPTPAD_CONFIG=${configFile}" + "HOME=%S/cryptpad/ressourcerie_banon" + ]; + ExecStart = "${pkgs.cryptpad}/bin/cryptpad"; + PrivateTmp = true; + Restart = "always"; + StateDirectory = "cryptpad/ressourcerie_banon"; + WorkingDirectory = "%S/cryptpad/ressourcerie_banon"; + }; + }; + services.websites.env.production.vhostConfs.ressourcerie_banon_cryptpad = { + certName = "ressourcerie_banon"; + addToCerts = true; + hosts = ["pad.le-garage-autonome.org"]; + root = null; + }; + }; +} diff --git a/modules/private/websites/ressourcerie_banon/production.nix b/modules/private/websites/ressourcerie_banon/production.nix new file mode 100644 index 0000000..fa00d92 --- /dev/null +++ b/modules/private/websites/ressourcerie_banon/production.nix @@ -0,0 +1,70 @@ +{ lib, pkgs, config, ... }: +let + cfg = config.myServices.websites.ressourcerie_banon.production; + varDir = "/var/lib/ftp/ressourcerie_banon"; + apacheUser = config.services.httpd.Prod.user; + apacheGroup = config.services.httpd.Prod.group; +in { + options.myServices.websites.ressourcerie_banon.production.enable = lib.mkEnableOption "enable Ressourcerie Banon's website"; + + config = lib.mkIf cfg.enable { + services.webstats.sites = [ { name = "ressourcerie-banon.org"; } ]; + + system.activationScripts.ressourcerie_banon = { + deps = [ "httpd" ]; + text = '' + install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/php/sessions/ressourcerie_banon + ''; + }; + systemd.services.phpfpm-ressourcerie_banon.after = lib.mkAfter [ "mysql.service" ]; + systemd.services.phpfpm-ressourcerie_banon.wants = [ "mysql.service" ]; + services.phpfpm.pools.ressourcerie_banon = { + user = apacheUser; + group = apacheGroup; + settings = { + "listen.owner" = apacheUser; + "listen.group" = apacheGroup; + + "pm" = "ondemand"; + "pm.max_children" = "5"; + "pm.process_idle_timeout" = "60"; + + "php_admin_value[open_basedir]" = "/var/lib/php/sessions/ressourcerie_banon:${varDir}:/tmp"; + "php_admin_value[session.save_path]" = "/var/lib/php/sessions/ressourcerie_banon"; + }; + phpOptions = config.services.phpfpm.phpOptions + '' + disable_functions = "mail" + ''; + phpPackage = pkgs.php72; + }; + services.websites.env.production.modules = [ "proxy_fcgi" ]; + services.websites.env.production.vhostConfs.ressourcerie_banon = { + certName = "ressourcerie_banon"; + certMainHost = "ressourcerie-banon.org"; + hosts = ["ressourcerie-banon.org" "www.ressourcerie-banon.org" "ressourcerie-sault.org" "www.ressourcerie-sault.org" "le-garage-autonome.org" + "www.le-garage-autonome.org"]; + root = varDir; + extraConfig = [ + '' + Use Stats ressourcerie-banon.org + + RewriteEngine on + RewriteCond "%{HTTP_HOST}" "!^ressourcerie-banon\.org$" [NC] + RewriteRule ^(.+)$ https://ressourcerie-banon.org$1 [R=302,L] + + + SetHandler "proxy:unix:${config.services.phpfpm.pools.ressourcerie_banon.socket}|fcgi://localhost" + + + + DirectoryIndex index.php index.htm index.html + Options Indexes FollowSymLinks MultiViews Includes + AllowOverride all + Require all granted + + '' + ]; + }; + }; +} + diff --git a/modules/private/websites/tools/cloud/farm.nix b/modules/private/websites/tools/cloud/farm.nix new file mode 100644 index 0000000..7be774c --- /dev/null +++ b/modules/private/websites/tools/cloud/farm.nix @@ -0,0 +1,123 @@ +{ lib, pkgs, config, ... }: +let + cfg = config.myServices.tools.cloud.farm; + apacheUser = config.services.httpd.Prod.user; + apacheGroup = config.services.httpd.Prod.group; + nextcloud = (pkgs.webapps.nextcloud.override { varDir = null; }).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.impersonate a.keeweb a.maps + a.metadata a.music a.notes a.ocsms a.passman a.polls a.spreed + a.tasks + ]); + toVardir = name: "/var/lib/nextcloud_farm/${name}"; + varDirs = map toVardir cfg.instances; + phpBaseDir = builtins.concatStringsSep ":" ([ nextcloud ] ++ varDirs ++ nextcloud.apps); + toVhost = name: '' + SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 + SetEnv NEXTCLOUD_CONFIG_DIR "${toVardir name}" + + AcceptPathInfo On + DirectoryIndex index.php + Options FollowSymlinks + Require all granted + AllowOverride all + + + Header always set Strict-Transport-Security "max-age=15552000; includeSubDomains; preload" + + + CGIPassAuth on + SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud_farm.socket}|fcgi://localhost" + + + + ''; +in +{ + options.myServices.tools.cloud.farm = { + instances = lib.mkOption { + description = "Instances names for the nextcloud Farm"; + default = []; + type = lib.types.listOf lib.types.str; + }; + vhosts = lib.mkOption { + description = "Instance vhosts configs"; + readOnly = true; + type = lib.types.attrsOf lib.types.str; + default = lib.genAttrs cfg.instances toVhost; + }; + package = lib.mkOption { + description = "Nextcloud derivation"; + readOnly = true; + type = lib.types.package; + default = nextcloud; + }; + }; + + config = lib.mkIf (builtins.length cfg.instances > 0) { + system.activationScripts.cloud_farm_vardirs = { + deps = [ "httpd" ]; + text = '' + install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${builtins.concatStringsSep " " varDirs} + install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d /var/lib/nextcloud_farm/phpSessions + ''; + }; + systemd.services.phpfpm-nextcloud_farm.after = lib.mkAfter [ "postgresql.service" ]; + systemd.services.phpfpm-nextcloud_farm.wants = [ "postgresql.service" ]; + services.phpfpm.pools.nextcloud_farm = { + user = apacheUser; + group = apacheGroup; + settings = { + "listen.owner" = apacheUser; + "listen.group" = apacheGroup; + "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[open_basedir]" = "/run/wrappers/bin/sendmail:${phpBaseDir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp"; + "php_admin_value[session.save_path]" = "/var/lib/nextcloud_farm/phpSessions"; + }; + phpPackage = pkgs.php74.withExtensions({ enabled, all }: enabled ++ [ all.redis all.apcu all.opcache ]); + }; + users.users.root.packages = let + toOcc = name: pkgs.writeScriptBin "nextcloud-occ-${name}" '' + #! ${pkgs.stdenv.shell} + cd ${nextcloud} + NEXTCLOUD_CONFIG_DIR="${toVardir name}" \ + exec \ + sudo -E -u wwwrun ${pkgs.php74}/bin/php \ + -c ${pkgs.php74}/etc/php.ini \ + occ $* + ''; + in map toOcc cfg.instances; + services.cron = { + enable = true; + systemCronJobs = let + toScript = name: pkgs.writeScriptBin "nextcloud-cron" '' + #! ${pkgs.stdenv.shell} + export LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive + export PATH=/run/wrappers/bin:$PATH + export NEXTCLOUD_CONFIG_DIR="${toVardir name}" + ${pkgs.php74}/bin/php -d memory_limit=512M -f ${nextcloud}/cron.php + ''; + toLine = name: '' + */15 * * * * wwwrun ${toScript name}/bin/nextcloud-cron + ''; + in map toLine cfg.instances; + }; + }; +} -- 2.41.0