diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-12-29 11:15:05 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-12-29 11:15:05 +0100 |
| commit | 25fd1d16198334f678129ddcd6e77ebf7edf9b72 (patch) | |
| tree | c14551d64c025ae5d2a0a3769faa9e2a2037495a /virtual | |
| parent | a05f8abec045c9bf6a47fd87d028984c1237130c (diff) | |
| download | Nix-25fd1d16198334f678129ddcd6e77ebf7edf9b72.tar.gz Nix-25fd1d16198334f678129ddcd6e77ebf7edf9b72.tar.zst Nix-25fd1d16198334f678129ddcd6e77ebf7edf9b72.zip | |
Add modules to httpd configuration
Diffstat (limited to 'virtual')
| -rw-r--r-- | virtual/eldiron.nix | 14 | ||||
| -rw-r--r-- | 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 @@ | |||
| 88 | logPerVirtualHost = true; | 88 | logPerVirtualHost = true; |
| 89 | multiProcessingModule = "worker"; | 89 | multiProcessingModule = "worker"; |
| 90 | adminAddr = "httpd@immae.eu"; | 90 | adminAddr = "httpd@immae.eu"; |
| 91 | extraModules = [ | 91 | # FIXME: http2 |
| 92 | "proxy_fcgi" # for PHP | 92 | extraModules = pkgs.lib.lists.unique ( |
| 93 | "macro" | 93 | mypkgs.adminer.apache.modules ++ |
| 94 | "ldap" | 94 | [ |
| 95 | "authnz_ldap" | 95 | "macro" |
| 96 | ]; | 96 | "ldap" |
| 97 | "authnz_ldap" | ||
| 98 | ]); | ||
| 97 | extraConfig = '' | 99 | extraConfig = '' |
| 98 | <IfModule ldap_module> | 100 | <IfModule ldap_module> |
| 99 | LDAPSharedCacheSize 500000 | 101 | 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 | |||
| 38 | apache = { | 38 | apache = { |
| 39 | user = "wwwrun"; | 39 | user = "wwwrun"; |
| 40 | group = "wwwrun"; | 40 | group = "wwwrun"; |
| 41 | modules = [ "proxy_fcgi" ]; | ||
| 41 | vhostConf = '' | 42 | vhostConf = '' |
| 42 | Alias /adminer ${webRoot} | 43 | Alias /adminer ${webRoot} |
| 43 | <Directory ${webRoot}> | 44 | <Directory ${webRoot}> |