From 7a32f2d15abc665d5db2aab4664b5edd6264175e Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 31 Jul 2013 13:35:21 +0200
Subject: [PATCH] Fix node_modules references in uptime module.

---
 modules/services/monitoring/uptime.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/services/monitoring/uptime.nix b/modules/services/monitoring/uptime.nix
index 8479372fab4..fa3de7d90bc 100644
--- a/modules/services/monitoring/uptime.nix
+++ b/modules/services/monitoring/uptime.nix
@@ -11,7 +11,7 @@ let
     ln -sv /var/lib/uptime/runtime.json $out/runtime.json
   '' else ''
     mkdir $out
-    cat ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/config/default.yaml > $out/default.yaml
+    cat ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/config/default.yaml > $out/default.yaml
     cat >> $out/default.yaml <<EOF
 
     autoStartMonitor: false
@@ -69,10 +69,10 @@ in {
       environment = {
         NODE_CONFIG_DIR = configDir;
         NODE_ENV = cfg.nodeEnv;
-        NODE_PATH = "${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/node_modules";
+        NODE_PATH = "${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/node_modules";
       };
       preStart = "mkdir -p /var/lib/uptime";
-      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/app.js";
+      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/app.js";
     };
 
     services.mongodb.enable = mkIf (!cfg.usesRemoteMongo) true;
@@ -85,11 +85,11 @@ in {
       environment = {
         NODE_CONFIG_DIR = configDir;
         NODE_ENV = cfg.nodeEnv;
-        NODE_PATH = "${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/node_modules";
+        NODE_PATH = "${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/node_modules";
       };
       # Ugh, need to wait for web service to be up
       preStart = if cfg.enableWebService then "sleep 1s" else "mkdir -p /var/lib/uptime";
-      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/node_modules/node-uptime/monitor.js";
+      serviceConfig.ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/monitor.js";
     };
   }) ];
 }