Author: eelco
Date: Fri Sep 10 15:03:18 2010
New Revision: 23725
URL: https://svn.nixos.org/websvn/nix/?rev=23725&sc=1
Log:
* Rename the confusingly named build-db-dell-R410.nix to webdsl.nix.
Added:
configurations/trunk/tud/webdsl.nix
- copied, changed from r23724,
configurations/trunk/tud/build-db-dell-R410.nix
Deleted:
configurations/trunk/tud/build-db-dell-R410.nix
Modified:
configurations/trunk/tud/couchdb.nix
Modified: configurations/trunk/tud/couchdb.nix
==============================================================================
--- configurations/trunk/tud/couchdb.nix Fri Sep 10 14:58:31 2010
(r23724)
+++ configurations/trunk/tud/couchdb.nix Fri Sep 10 15:03:18 2010
(r23725)
@@ -30,8 +30,9 @@
name = "couchdb-wrapper";
text = ''
#!/bin/sh
- EXTRA_PATH="${config.services.couchdb.extraPath}"
- HOME=${stateDir} PATH="$PATH''${EXTRA_PATH:+:}$EXTRA_PATH"
${couchdb}/bin/couchdb ${couchdbFlags}
+ export HOME=${stateDir}
+ export PATH=$PATH:${getopt}/bin
+ ${couchdb}/bin/couchdb ${couchdbFlags}
'';
executable = true;
destination = "/bin/couchdb";
Copied and modified: configurations/trunk/tud/webdsl.nix (from r23724,
configurations/trunk/tud/build-db-dell-R410.nix)
==============================================================================
--- configurations/trunk/tud/build-db-dell-R410.nix Fri Sep 10 14:58:31
2010 (r23724, copy source)
+++ configurations/trunk/tud/webdsl.nix Fri Sep 10 15:03:18 2010 (r23725)
@@ -89,6 +89,7 @@
host all all ::1/128 md5
host all all 130.161.159.80/32 md5
host all all 130.161.158.181/32 md5
+ host all all 94.208.39.185/32 md5
'';
};
@@ -121,7 +122,9 @@
services.tomcat = {
enable = true;
baseDir = "/data/tomcat";
- javaOpts = "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m
-Xmx2048m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit";
+ javaOpts = "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m
-Xss8m -Xmx2048m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit
"
+ + "-Dcom.sun.management.jmxremote
-Dcom.sun.management.jmxremote.port=8999
-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false
-Djava.rmi.server.hostname=localhost "
+ + "-XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=/data/tomcat/logs/java_pid<pid>.hprof";
logPerVirtualHost = true;
virtualHosts = [
{ name = "researchr.org";}
@@ -232,5 +235,5 @@
};
- environment.systemPackages = [ pkgs.strategoPackages018.strategoxt ];
+ environment.systemPackages = [ pkgs.stdenv pkgs.lsiutil ] ++ (with
pkgs.strategoPackages018; [ aterm sdf strategoxt ]) ;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
