aboutsummaryrefslogtreecommitdiff
path: root/virtual/modules/websites/default.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-21 21:06:33 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-21 21:06:33 +0100
commita5365ec3d924a91abdd80c4f58d2158472788de9 (patch)
treefbcda39758dc703f0c73fd1e7b224e4675c61edb /virtual/modules/websites/default.nix
parent7fff3ab2628284e7f53bee04401621f4c0963b4f (diff)
downloadNix-a5365ec3d924a91abdd80c4f58d2158472788de9.tar.gz
Nix-a5365ec3d924a91abdd80c4f58d2158472788de9.tar.zst
Nix-a5365ec3d924a91abdd80c4f58d2158472788de9.zip
Move all fixmes to mantisbt issue tracking
Fixes https://git.immae.eu/mantisbt/view.php?id=111
Diffstat (limited to 'virtual/modules/websites/default.nix')
-rw-r--r--virtual/modules/websites/default.nix3
1 files changed, 0 insertions, 3 deletions
diff --git a/virtual/modules/websites/default.nix b/virtual/modules/websites/default.nix
index 4b1490b..cfd1f86 100644
--- a/virtual/modules/websites/default.nix
+++ b/virtual/modules/websites/default.nix
@@ -203,7 +203,6 @@ in
203 }; 203 };
204 ldap = { 204 ldap = {
205 modules = [ "ldap" "authnz_ldap" ]; 205 modules = [ "ldap" "authnz_ldap" ];
206 # FIXME: starttls
207 extraConfig = assert mylibs.checkEnv "NIXOPS_HTTP_LDAP_PASSWORD"; '' 206 extraConfig = assert mylibs.checkEnv "NIXOPS_HTTP_LDAP_PASSWORD"; ''
208 <IfModule ldap_module> 207 <IfModule ldap_module>
209 LDAPSharedCacheSize 500000 208 LDAPSharedCacheSize 500000
@@ -283,8 +282,6 @@ in
283 ''; 282 '';
284 }; 283 };
285 284
286 # FIXME: logrotate
287 # FIXME: ipv6
288 services.httpdProd = makeService "production" config.services.myWebsites.production; 285 services.httpdProd = makeService "production" config.services.myWebsites.production;
289 services.myWebsites.production.modules = pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules or []) cfg.apacheConfig); 286 services.myWebsites.production.modules = pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules or []) cfg.apacheConfig);
290 services.myWebsites.production.extraConfig = (builtins.filter (x: x != null) (pkgs.lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) cfg.apacheConfig)); 287 services.myWebsites.production.extraConfig = (builtins.filter (x: x != null) (pkgs.lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) cfg.apacheConfig));