Add cacert as dependency when building private git

[perso/Immae/Config/Nix.git] / virtual / eldiron.nix

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 50aaeab37edcba8f8fce2d9d6fd381445e4ee827..ed414298a2d44334c2af1368a0631d8b4303f5cd 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -52,6 +52,8 @@
       };
     };
 
+    services.ympd = mypkgs.ympd.config // { enable = true; };
+
     # FIXME: open_basedir
     services.phpfpm = {
       extraConfig = ''
@@ -86,12 +88,14 @@
       logPerVirtualHost = true;
       multiProcessingModule = "worker";
       adminAddr = "httpd@immae.eu";
-      extraModules = [
-        "proxy_fcgi" # for PHP
-        "macro"
-        "ldap"
-        "authnz_ldap"
-      ];
+      # FIXME: http2
+      extraModules = pkgs.lib.lists.unique (
+        mypkgs.adminer.apache.modules ++
+        [
+          "macro"
+          "ldap"
+          "authnz_ldap"
+        ]);
       extraConfig = ''
         <IfModule ldap_module>
           LDAPSharedCacheSize 500000
@@ -133,6 +137,7 @@
           documentRoot = null;
           extraConfig = builtins.concatStringsSep "\n" [
             mypkgs.adminer.apache.vhostConf
+            mypkgs.ympd.apache.vhostConf
           ];
         })
         { # Should go last, default fallback