X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=a5e7f2e6897c6febe41af4804b7ed2d3b7bab8b9;hb=7df5e532c1ce2ab9e8527615c08c1178990870e6;hp=0cb7a1062ebc7520320d2b37b8a569b2dfd9f8bf;hpb=a8ef1adb4a90c2524ac09a85463598e5d41d2a4a;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 0cb7a10..a5e7f2e 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -47,6 +47,9 @@ let
   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 {};
 
@@ -65,6 +68,7 @@ in {
       ++ ttrss.keys
       ++ wallabag.keys
       ++ yourls.keys
+      ++ dmarc-reports.keys
       ++ webhooks.keys;
 
     services.duplyBackup.profiles = {
@@ -88,6 +92,7 @@ in {
       ++ rompr.apache.modules
       ++ shaarli.apache.modules
       ++ dokuwiki.apache.modules
+      ++ dmarc-reports.apache.modules
       ++ phpbb.apache.modules
       ++ ldap.apache.modules
       ++ kanboard.apache.modules;
@@ -147,6 +152,7 @@ in {
         (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">
@@ -342,6 +348,15 @@ in {
         group = "wwwrun";
         settings = shaarli.phpFpm.pool;
       };
+      dmarc-reports = {
+        user = "wwwrun";
+        group = "wwwrun";
+        settings = dmarc-reports.phpFpm.pool;
+        phpEnv = dmarc-reports.phpFpm.phpEnv;
+        phpOptions = config.services.phpfpm.phpOptions + ''
+          extension=${pkgs.php}/lib/php/extensions/mysqli.so
+        '';
+      };
       dokuwiki = {
         user = "wwwrun";
         group = "wwwrun";
@@ -386,6 +401,7 @@ in {
 
     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";