summary refs log tree commit diff
path: root/nixos/modules/services/web-servers/lighttpd/default.nix
diff options
context:
space:
mode:
authorHarald van Dijk <harald@gigawatt.nl>2014-08-11 23:38:21 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-08-12 21:16:01 +0200
commit67a5ec4efb83d415cc8e0860b56b93198fe2d233 (patch)
tree0aa556d1d3901ee495b6c1af4517afbff75f28a8 /nixos/modules/services/web-servers/lighttpd/default.nix
parent56f409a4463f09f05b69cf9b8a73851fb0f8e722 (diff)
downloadnixpkgs-67a5ec4efb83d415cc8e0860b56b93198fe2d233.tar
nixpkgs-67a5ec4efb83d415cc8e0860b56b93198fe2d233.tar.gz
nixpkgs-67a5ec4efb83d415cc8e0860b56b93198fe2d233.tar.bz2
nixpkgs-67a5ec4efb83d415cc8e0860b56b93198fe2d233.tar.lz
nixpkgs-67a5ec4efb83d415cc8e0860b56b93198fe2d233.tar.xz
nixpkgs-67a5ec4efb83d415cc8e0860b56b93198fe2d233.tar.zst
nixpkgs-67a5ec4efb83d415cc8e0860b56b93198fe2d233.zip
nixos/lighttpd: fix modules for gitweb
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.

[Bjørn: modify commit message]
Diffstat (limited to 'nixos/modules/services/web-servers/lighttpd/default.nix')
-rw-r--r--nixos/modules/services/web-servers/lighttpd/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index f0f59a66402..fc9487ab485 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -9,9 +9,9 @@ let
   cfg = config.services.lighttpd;
 
   needModRedirect = cfg.gitweb.enable;
-  needModAlias = cfg.cgit.enable or cfg.gitweb.enable;
-  needModSetenv = cfg.cgit.enable or cfg.gitweb.enable;
-  needModCgi = cfg.cgit.enable or cfg.gitweb.enable;
+  needModAlias = cfg.cgit.enable || cfg.gitweb.enable;
+  needModSetenv = cfg.cgit.enable || cfg.gitweb.enable;
+  needModCgi = cfg.cgit.enable || cfg.gitweb.enable;
   needModStatus = cfg.mod_status;
   needModUserdir = cfg.mod_userdir;