Add modules to httpd configuration

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 160595d0cc08ab16c52be6c699c8b304bc1b9fc7..ed414298a2d44334c2af1368a0631d8b4303f5cd 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -88,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

diff --git a/virtual/packages.nix b/virtual/packages.nix
index 6d85411763972cb0d18f6e97dae99758e2115893..3e143a1fbf49cfe632adebfc0423c40d29fb9f1c 100644 (file)
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -38,6 +38,7 @@ let
     apache = {
       user = "wwwrun";
       group = "wwwrun";
+      modules = [ "proxy_fcgi" ];
       vhostConf = ''
         Alias /adminer ${webRoot}
         <Directory ${webRoot}>