From 25fd1d16198334f678129ddcd6e77ebf7edf9b72 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 29 Dec 2018 11:15:05 +0100
Subject: [PATCH] Add modules to httpd configuration

---
 virtual/eldiron.nix  | 14 ++++++++------
 virtual/packages.nix |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 160595d..ed41429 100644
--- 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 6d85411..3e143a1 100644
--- 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}>
-- 
2.41.0