From abd7458cbc97f9074f851f07f1f9145344b981ff Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 8 Feb 2021 22:27:00 +0100 Subject: [PATCH] =?utf8?q?Add=20bakeer=E2=80=99s=20website?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- modules/private/default.nix | 2 + .../system/quatresaisons/nextcloud.nix | 2 +- modules/private/websites/bakeer/cloud.nix | 115 ++++++++++++++++++ modules/private/websites/default.nix | 1 + .../private/websites/tools/cloud/default.nix | 2 +- nixops/secrets | 2 +- pkgs/webapps/nextcloud/apps/impersonate.nix | 9 ++ pkgs/webapps/nextcloud/default.nix | 6 +- 8 files changed, 133 insertions(+), 6 deletions(-) create mode 100644 modules/private/websites/bakeer/cloud.nix create mode 100644 pkgs/webapps/nextcloud/apps/impersonate.nix diff --git a/modules/private/default.nix b/modules/private/default.nix index b821488..ddc4281 100644 --- a/modules/private/default.nix +++ b/modules/private/default.nix @@ -19,6 +19,8 @@ set = { # Personal websites + bakeerCloud = ./websites/bakeer/cloud.nix; + capitainesLandingPages = ./websites/capitaines/landing_pages.nix; chloeInte = ./websites/chloe/integration.nix; diff --git a/modules/private/system/quatresaisons/nextcloud.nix b/modules/private/system/quatresaisons/nextcloud.nix index 047d17e..89d69d5 100644 --- a/modules/private/system/quatresaisons/nextcloud.nix +++ b/modules/private/system/quatresaisons/nextcloud.nix @@ -95,7 +95,7 @@ in { cd ${nextcloud} NEXTCLOUD_CONFIG_DIR="${nextcloud}/config" \ exec \ - sudo -u wwwrun ${pkgs.php74}/bin/php \ + sudo -E -u wwwrun ${pkgs.php74}/bin/php \ -c ${pkgs.php74}/etc/php.ini \ occ $* ''; diff --git a/modules/private/websites/bakeer/cloud.nix b/modules/private/websites/bakeer/cloud.nix new file mode 100644 index 0000000..001ca03 --- /dev/null +++ b/modules/private/websites/bakeer/cloud.nix @@ -0,0 +1,115 @@ +{ 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); +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 ]; + services.websites.env.production.modules = [ "proxy_fcgi" ]; + services.websites.env.production.vhostConfs.bakeer = { + certName = "bakeer"; + certMainHost = "bakeer.immae.eu"; + addToCerts = true; + 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 + '' + ]; + }; + }; +} + diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index ddfab9a..530db59 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix @@ -222,6 +222,7 @@ in _theme = pkgs.webapps.apache-theme.theme; }; myServices.websites = { + bakeer.cloud.enable = true; capitaines.landing_pages.enable = true; chloe = { diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index 1a42296..8a42cad 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix @@ -140,7 +140,7 @@ in { cd ${nextcloud} NEXTCLOUD_CONFIG_DIR="${nextcloud}/config" \ exec \ - sudo -u wwwrun ${pkgs.php74}/bin/php \ + sudo -E -u wwwrun ${pkgs.php74}/bin/php \ -c ${pkgs.php74}/etc/php.ini \ occ $* ''; diff --git a/nixops/secrets b/nixops/secrets index 58ffafe..6864a6e 160000 --- a/nixops/secrets +++ b/nixops/secrets @@ -1 +1 @@ -Subproject commit 58ffafe8d341088e117ff2ea4ce7fd33d9d6bc92 +Subproject commit 6864a6e47101fa922e8d0bca60b9d0ca30803b27 diff --git a/pkgs/webapps/nextcloud/apps/impersonate.nix b/pkgs/webapps/nextcloud/apps/impersonate.nix new file mode 100644 index 0000000..66cc893 --- /dev/null +++ b/pkgs/webapps/nextcloud/apps/impersonate.nix @@ -0,0 +1,9 @@ +{ buildApp, nextcloudVersion }: +assert nextcloudVersion >= 18 && nextcloudVersion < 19; +buildApp rec { + appName = "impersonate"; + version = "1.5.2"; + url = "https://github.com/nextcloud/impersonate/releases/download/v${version}/${appName}.tar.gz"; + sha256 = "03fm9d2p6ap9gyiw5anmlwsdmiyklrkpdgchfx2zfgxn38pjrz6d"; +} + diff --git a/pkgs/webapps/nextcloud/default.nix b/pkgs/webapps/nextcloud/default.nix index 1df483a..5017fd2 100644 --- a/pkgs/webapps/nextcloud/default.nix +++ b/pkgs/webapps/nextcloud/default.nix @@ -3,9 +3,9 @@ let appNames = [ "apporder" "audioplayer" "bookmarks" "calendar" "carnet" "circles" "contacts" "cookbook" "deck" "extract" "files_markdown" - "files_readmemd" "flowupload" "gpxedit" "gpxpod" "keeweb" "maps" - "metadata" "music" "notes" "ocsms" "passman" "polls" "spreed" - "social" "tasks" + "files_readmemd" "flowupload" "gpxedit" "gpxpod" "impersonate" + "keeweb" "maps" "metadata" "music" "notes" "ocsms" "passman" "polls" + "spreed" "social" "tasks" ]; allApps = lib.attrsets.genAttrs appNames (name: callPackage (./apps + "/${name}.nix") { inherit buildApp nextcloudVersion; }); -- 2.41.0