X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=bffcf84f81afee20ec092aa4ef997a9f3b9bafc6;hp=97402f19176cdb0703681841793bb827f4bcf959;hb=f5761aac8dbfb4af91c232f2b52d1353c899abda;hpb=ea3b46ee264fc1c01d62a7f3ee538b14cb6e3dca

diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 97402f1..bffcf84 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -9,12 +9,13 @@ let
   ttrss = pkgs.callPackage ./ttrss.nix {
     inherit (pkgs.webapps) ttrss ttrss-plugins;
     env = config.myEnv.tools.ttrss;
+    php = pkgs.php72;
   };
   kanboard = pkgs.callPackage ./kanboard.nix  {
     env = config.myEnv.tools.kanboard;
   };
   wallabag = pkgs.callPackage ./wallabag.nix {
-    inherit (pkgs.webapps) wallabag;
+    wallabag = pkgs.webapps.wallabag.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
     env = config.myEnv.tools.wallabag;
   };
   yourls = pkgs.callPackage ./yourls.nix {
@@ -36,8 +37,22 @@ let
     env = config.myEnv.tools.phpldapadmin;
   };
   grocy = pkgs.callPackage ./grocy.nix {
-    inherit (pkgs.webapps) grocy;
+    grocy = pkgs.webapps.grocy.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
   };
+  phpbb = pkgs.callPackage ./phpbb.nix {
+    phpbb = (pkgs.webapps.phpbb.withLangs (l: [ l.fr ])).withExts (e: [
+      e.alfredoramos.markdown e.davidiq.mailinglist e.dmzx.mchat
+      e.empteintesduweb.monitoranswers e.lr94.autosubscribe
+      e.phpbbmodders.adduser ]);
+  };
+  webhooks = pkgs.callPackage ./webhooks.nix {
+    env = config.myEnv.tools.webhooks;
+  };
+  dmarc-reports = pkgs.callPackage ./dmarc_reports.nix {
+    env = config.myEnv.tools.dmarc_reports;
+  };
+
+  landing = pkgs.callPackage ./landing.nix {};
 
   cfg = config.myServices.websites.tools.tools;
   pcfg = config.services.phpfpm.pools;
@@ -53,7 +68,9 @@ in {
       ++ shaarli.keys
       ++ ttrss.keys
       ++ wallabag.keys
-      ++ yourls.keys;
+      ++ yourls.keys
+      ++ dmarc-reports.keys
+      ++ webhooks.keys;
 
     services.duplyBackup.profiles = {
       dokuwiki = dokuwiki.backups;
@@ -63,6 +80,7 @@ in {
       shaarli = shaarli.backups;
       ttrss = ttrss.backups;
       wallabag = wallabag.backups;
+      phpbb = phpbb.backups;
     };
 
     services.websites.env.tools.modules =
@@ -75,6 +93,8 @@ in {
       ++ rompr.apache.modules
       ++ shaarli.apache.modules
       ++ dokuwiki.apache.modules
+      ++ dmarc-reports.apache.modules
+      ++ phpbb.apache.modules
       ++ ldap.apache.modules
       ++ kanboard.apache.modules;
 
@@ -104,17 +124,18 @@ in {
       certName    = "eldiron";
       addToCerts  = true;
       hosts       = ["tools.immae.eu" ];
-      root        = "/var/lib/ftp/tools.immae.eu";
+      root        = landing;
       extraConfig = [
         ''
           RedirectMatch 301 ^/vpn(.*)$         https://vpn.immae.eu$1
           RedirectMatch 301 ^/roundcube(.*)$   https://mail.immae.eu/roundcube$1
           RedirectMatch 301 ^/jappix(.*)$      https://im.immae.fr/converse
 
-          <Directory "/var/lib/ftp/tools.immae.eu">
-            DirectoryIndex index.php index.htm index.html
-            AllowOverride all
+          <Directory "${landing}">
+            DirectoryIndex index.html
+            AllowOverride None
             Require all granted
+
             <FilesMatch "\.php$">
               SetHandler "proxy:unix:${pcfg.tools.socket}|fcgi://localhost"
             </FilesMatch>
@@ -131,6 +152,8 @@ in {
         (ldap.apache.vhostConf pcfg.ldap.socket)
         (kanboard.apache.vhostConf pcfg.kanboard.socket)
         (grocy.apache.vhostConf pcfg.grocy.socket)
+        (phpbb.apache.vhostConf pcfg.phpbb.socket)
+        (dmarc-reports.apache.vhostConf pcfg.dmarc-reports.socket)
         ''
           Alias /paste /var/lib/fiche
           <Directory "/var/lib/fiche">
@@ -139,6 +162,23 @@ in {
             Require all granted
             Options -Indexes
           </Directory>
+
+          Alias /BIP39 /var/lib/buildbot/outputs/bip39
+          <Directory "/var/lib/buildbot/outputs/bip39">
+            DirectoryIndex index.html
+            AllowOverride None
+            Require all granted
+          </Directory>
+
+          Alias /webhooks ${config.secrets.location}/webapps/webhooks
+          <Directory "${config.secrets.location}/webapps/webhooks">
+            Options -Indexes
+            Require all granted
+            AllowOverride None
+            <FilesMatch "\.php$">
+              SetHandler "proxy:unix:${pcfg.tools.socket}|fcgi://localhost"
+            </FilesMatch>
+          </Directory>
         ''
       ];
     };
@@ -180,6 +220,10 @@ in {
         after = lib.mkAfter dokuwiki.phpFpm.serviceDeps;
         wants = dokuwiki.phpFpm.serviceDeps;
       };
+      phpfpm-phpbb = {
+        after = lib.mkAfter phpbb.phpFpm.serviceDeps;
+        wants = phpbb.phpFpm.serviceDeps;
+      };
       phpfpm-kanboard = {
         after = lib.mkAfter kanboard.phpFpm.serviceDeps;
         wants = kanboard.phpFpm.serviceDeps;
@@ -217,7 +261,7 @@ in {
         description = "Tiny Tiny RSS feeds update daemon";
         serviceConfig = {
           User = "wwwrun";
-          ExecStart = "${pkgs.php}/bin/php ${ttrss.webRoot}/update.php --daemon";
+          ExecStart = "${pkgs.php72}/bin/php ${ttrss.webRoot}/update.php --daemon";
           StandardOutput = "syslog";
           StandardError = "syslog";
           PermissionsStartOnly = true;
@@ -249,8 +293,15 @@ in {
 
           # 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]" = builtins.concatStringsSep ":" [
+            "/run/wrappers/bin/sendmail" landing "/tmp"
+            "${config.secrets.location}/webapps/webhooks"
+          ];
+        };
+        phpEnv = {
+          CONTACT_EMAIL = config.myEnv.tools.contact;
         };
+        phpPackage = pkgs.php72;
       };
       devtools = {
         user = "wwwrun";
@@ -266,59 +317,75 @@ in {
 
           "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
-          '';
+        phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [e.mysqli e.redis e.apcu e.opcache ]);
       };
       adminer = adminer.phpFpm;
       ttrss = {
         user = "wwwrun";
         group = "wwwrun";
         settings = ttrss.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       wallabag = {
         user = "wwwrun";
         group = "wwwrun";
         settings = wallabag.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       yourls = {
         user = "wwwrun";
         group = "wwwrun";
         settings = yourls.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       rompr = {
         user = "wwwrun";
         group = "wwwrun";
         settings = rompr.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       shaarli = {
         user = "wwwrun";
         group = "wwwrun";
         settings = shaarli.phpFpm.pool;
+        phpPackage = pkgs.php72;
+      };
+      dmarc-reports = {
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = dmarc-reports.phpFpm.pool;
+        phpEnv = dmarc-reports.phpFpm.phpEnv;
+        phpPackage = pkgs.php72;
       };
       dokuwiki = {
         user = "wwwrun";
         group = "wwwrun";
         settings = dokuwiki.phpFpm.pool;
+        phpPackage = pkgs.php72;
+      };
+      phpbb = {
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = phpbb.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       ldap = {
         user = "wwwrun";
         group = "wwwrun";
         settings = ldap.phpFpm.pool;
-        phpPackage = pkgs.php74;
+        phpPackage = pkgs.php72;
       };
       kanboard = {
         user = "wwwrun";
         group = "wwwrun";
         settings = kanboard.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
       grocy = {
         user = "wwwrun";
         group = "wwwrun";
         settings = grocy.phpFpm.pool;
+        phpPackage = pkgs.php72;
       };
     };
 
@@ -331,13 +398,16 @@ in {
       rompr = rompr.activationScript;
       shaarli = shaarli.activationScript;
       dokuwiki = dokuwiki.activationScript;
+      phpbb = phpbb.activationScript;
       kanboard = kanboard.activationScript;
       ldap = ldap.activationScript;
     };
 
-    myServices.websites.webappDirs = {
+    services.websites.webappDirs = {
       _adminer = adminer.webRoot;
+      "${dmarc-reports.apache.webappName}" = dmarc-reports.webRoot;
       "${dokuwiki.apache.webappName}" = dokuwiki.webRoot;
+      "${phpbb.apache.webappName}" = phpbb.webRoot;
       "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs";
       "${rompr.apache.webappName}" = rompr.webRoot;
       "${shaarli.apache.webappName}" = shaarli.webRoot;