Author: rob
Date: Wed May 4 18:45:44 2011
New Revision: 27151
URL: https://svn.nixos.org/websvn/nix/?rev=27151&sc=1
Log:
uncommitted changes
Modified:
configurations/trunk/tud/hydra-module.nix
Modified: configurations/trunk/tud/hydra-module.nix
==============================================================================
--- configurations/trunk/tud/hydra-module.nix Wed May 4 18:27:26 2011
(r27150)
+++ configurations/trunk/tud/hydra-module.nix Wed May 4 18:45:44 2011
(r27151)
@@ -4,15 +4,19 @@
let
cfg = config.services.hydra;
-
- hydraConf = pkgs.writeScript "hydra.conf" ''
+
+ hydra = pkgs.hydra;
+ hydraConf = pkgs.writeScript "hydra.conf"
+ ''
using_frontend_proxy 1
base_uri ${cfg.hydraURL}
notification_sender ${cfg.notificationSender}
max_servers 25
'';
- env = ''NIX_REMOTE=daemon HYDRA_DBI="${cfg.dbi}"
HYDRA_CONFIG=${cfg.baseDir}/data/hydra.conf HYDRA_DATA=${cfg.baseDir}/data'';
+ env = ''NIX_REMOTE=daemon HYDRA_DBI="${cfg.dbi}"
HYDRA_CONFIG=${cfg.baseDir}/data/hydra.conf HYDRA_DATA=${cfg.baseDir}/data ''
+ + ''HYDRA_TRACKER="${cfg.tracker}" '';
+
in
{
@@ -28,7 +32,7 @@
};
baseDir = mkOption {
- default = ''/home/${user.default}'';
+ default = "/home/${user.default}";
description = ''
The directory holding configuration, logs and temporary files.
'';
@@ -68,13 +72,21 @@
Threshold of minimum disk space (G) to determine if evaluator should
run or not.
'';
};
-
+
notificationSender = mkOption {
default = "[email protected]";
description = ''
Sender email address used for email notifications.
'';
};
+
+ tracker = mkOption {
+ default = "";
+ description = ''
+ Piece of HTML that is included on all pages.
+ '';
+ };
+
};
};
@@ -83,6 +95,7 @@
###### implementation
config = mkIf cfg.enable {
+# environment.systemPackages = [ hydra ];
users.extraUsers = [
{ name = cfg.user;
@@ -100,7 +113,8 @@
nix.nrBuildUsers = 100;
nix.gc.automatic = true;
- nix.gc.options = ''--max-freed "$((200 * 1024**3 - 1024 * $(df /nix/store
| tail -n 1 | awk '{ print $4 }')))"'';
+ # $3 / $4 don't always work depending on length of device name
+ nix.gc.options = ''--max-freed "$((200 * 1024**3 - 1024 * $(df /nix/store
| tail -n 1 | awk '{ print $3 }')))"'';
nix.extraOptions = ''
gc-keep-outputs = true
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
