From f0b34fe8ff6abc8d2612e63122c40c5eb0e7d5f2 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Sun, 9 Mar 2014 18:57:17 +0100
Subject: searx: refactor a bit

---
 nixos/modules/services/networking/searx.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'nixos/modules/services/networking/searx.nix')

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index e777239d478..30f21151a76 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -21,7 +21,7 @@ in
       enable = mkOption {
         default = false;
         description = "
-          Whether to enable the Searx server.
+          Whether to enable the Searx server. See https://github.com/asciimoo/searx
         ";
       };
 
@@ -59,15 +59,14 @@ in
         description = "Searx server, the meta search engine.";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig.User = "searx";
-        script = ''
-            if [ -z "${configFile}" ]; then
-              exec ${pkgs.pythonPackages.searx}/bin/searx-run
-            else
-              SEARX_SETTINGS_PATH="${configFile}" exec ${pkgs.pythonPackages.searx}/bin/searx-run
-            fi
-        '';
-      };
+        serviceConfig = {
+          User = "searx";
+          ExecStart = "${pkgs.pythonPackages.searx}/bin/searx-run";
+        };
+      } // (optionalAttrs (configFile != "") {
+        environment.SEARX_SETTINGS_PATH = configFile;
+      });
+        
 
     environment.systemPackages = [ pkgs.pythonPackages.searx ];
 
-- 
cgit 1.4.1