From 67a5ec4efb83d415cc8e0860b56b93198fe2d233 Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Mon, 11 Aug 2014 23:38:21 +0200 Subject: nixos/lighttpd: fix modules for gitweb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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] --- nixos/modules/services/web-servers/lighttpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/modules/services/web-servers/lighttpd/default.nix') 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; -- cgit 1.4.1