svn path=/configurations/trunk/tud/; revision=25880
svn path=/configurations/trunk/tud/; revision=25880
Rob Vermaas committed
Feb 10, 2011 at 12:01 UTC
e0dd54465c0aa522664dbb4e4c7223901478b924
1 file changed
+25
-4
webdsl.nix
+25
-4
@@ -11,7 +11,7 @@ let
11
in
12
13
{
14
- require = [ ./common.nix ./couchdb.nix ] ;
14
+ require = [ ./common.nix ] ;
15
16
boot.initrd.kernelModules = [ "mptsas" ];
17
boot.kernelModules = ["acpi-cpufreq" "kvm-intel"];
@@ -27,6 +27,8 @@ in
27
}
28
];
29
30
+ services.ttyBackgrounds.enable = false;
31
+
32
services.zabbixAgent.extraConfig = ''
33
UserParameter=mysql_threads,${pkgs.mysql}/bin/mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
34
UserParameter=mysql_questions,${pkgs.mysql}/bin/mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
@@ -78,10 +80,19 @@ in
80
databases = [ "hydra" ];
81
};
82
83
+ services.syslogd.extraConfig = ''
84
+ local0.* -/var/log/pgsql
85
+ '';
86
+
87
services.postgresql = {
88
enable = true;
89
enableTCPIP = true;
90
dataDir = "/data/postgresql";
91
+ extraConfig = ''
92
+ log_min_duration_statement = 200
93
+ log_duration = off
94
+ log_statement = 'none'
95
+ '';
96
authentication = ''
97
local all mediawiki ident mediawiki-users
98
local all all ident sameuser
@@ -122,7 +133,7 @@ in
133
services.tomcat = {
134
enable = true;
135
baseDir = "/data/tomcat";
125
- javaOpts = "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m -Xss8m -Xmx2048m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit "
136
+ javaOpts = "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m -Xss8m -Xmx4096m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit -XX:+UseCompressedOops "
137
+ "-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 "
138
+ "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/tomcat/logs/java_pid<pid>.hprof";
139
logPerVirtualHost = true;
@@ -136,6 +147,8 @@ in
147
{ name = "book.webdsl.org"; }
148
{ name = "yellowgrass.org"; }
149
{ name = "www.yellowgrass.org"; }
150
+ { name = "eelcovisser.org"; }
151
+ { name = "dsl-engineering.org"; }
152
];
153
};
154
@@ -143,6 +156,7 @@ in
156
enable = true;
157
user = "root";
158
databases = [ "researchr" "twitterarchive" "webdslorg" "pilweb" "mysql" "yellowgrass" "department" ];
159
+ singleTransaction = true;
160
};
161
162
users = {
@@ -200,7 +214,7 @@ in
214
215
boot.loader.grub.device = "/dev/sda";
216
boot.loader.grub.copyKernels = true;
203
- boot.kernelPackages = pkgs.linuxPackages_2_6_29;
217
+ boot.kernelPackages = pkgs.linuxPackages_2_6_35;
218
219
swapDevices = [ { label = "swap"; } ];
220
@@ -223,9 +237,16 @@ in
237
extraHosts = "127.0.0.2 webdsl.st.ewi.tudelft.nl webdsl";
238
239
interfaces = [ { ipAddress = "130.161.159.114"; name = "eth0"; subnetMask = "255.255.254.0"; } ];
226
- nameservers = [ "130.161.158.4" "130.161.158.133" ];
240
+ nameservers = [ "130.161.180.65" "130.161.158.4" ];
241
242
useDHCP = false;
243
+
244
+ defaultMailServer = {
245
+ directDelivery = true;
246
+ hostName = "smtp.tudelft.nl";
247
+ domain = "st.ewi.tudelft.nl";
248
+ };
249
+
250
};
251
252
environment.systemPackages = [ pkgs.stdenv pkgs.lsiutil ] ++ (with pkgs.strategoPackages018; [ aterm sdf strategoxt ]) ;