* Rename the confusingly named build-db-dell-R410.nix to webdsl.nix.
svn path=/configurations/trunk/tud/; revision=23725
Eelco Dolstra committed
Sep 10, 2010 at 15:03 UTC
d59ec7bd1b53590d8f36d1f0fc0584d35975ae1f
2 files changed
+8
-4
couchdb.nix
+3
-2
@@ -30,8 +30,9 @@ let
30
name = "couchdb-wrapper";
31
text = ''
32
#!/bin/sh
33
- EXTRA_PATH="${config.services.couchdb.extraPath}"
34
- HOME=${stateDir} PATH="$PATH''${EXTRA_PATH:+:}$EXTRA_PATH" ${couchdb}/bin/couchdb ${couchdbFlags}
33
+ export HOME=${stateDir}
34
+ export PATH=$PATH:${getopt}/bin
35
+ ${couchdb}/bin/couchdb ${couchdbFlags}
36
'';
37
executable = true;
38
destination = "/bin/couchdb";
webdsl.nix
renamed
+5
-2
@@ -89,6 +89,7 @@ in
89
host all all ::1/128 md5
90
host all all 130.161.159.80/32 md5
91
host all all 130.161.158.181/32 md5
92
+ host all all 94.208.39.185/32 md5
93
'';
94
};
95
@@ -121,7 +122,9 @@ in
122
services.tomcat = {
123
enable = true;
124
baseDir = "/data/tomcat";
124
- javaOpts = "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m -Xmx2048m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit";
125
+ javaOpts = "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m -Xss8m -Xmx2048m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit "
126
+ + "-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 "
127
+ + "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/tomcat/logs/java_pid<pid>.hprof";
128
logPerVirtualHost = true;
129
virtualHosts = [
130
{ name = "researchr.org";}
@@ -232,5 +235,5 @@ in
235
236
};
237
235
- environment.systemPackages = [ pkgs.strategoPackages018.strategoxt ];
238
+ environment.systemPackages = [ pkgs.stdenv pkgs.lsiutil ] ++ (with pkgs.strategoPackages018; [ aterm sdf strategoxt ]) ;
239
}