@cryptotaxi247 / infra-1 / commits / b489c04b

svn path=/configurations/trunk/tud/; revision=24886

svn path=/configurations/trunk/tud/; revision=24886

Eelco Dolstra committed Nov 26, 2010 at 22:50 UTC b489c04bc19ced9fcb1de33cd2a16efcd66528e0
2 files changed +41 -14
common.nix
+4 -1
@@ -3,7 +3,10 @@
3 {
4 boot.kernelModules = [ "coretemp" ];
5
6 - environment.systemPackages = [ pkgs.emacs pkgs.subversion pkgs.sysstat pkgs.hdparm pkgs.sdparm pkgs.lsiutil ];
6 + environment.systemPackages =
7 + [ pkgs.emacs pkgs.subversion pkgs.sysstat pkgs.hdparm pkgs.sdparm pkgs.lsiutil
8 + pkgs.htop
9 + ];
10
11 services.sshd.enable = true;
12
lucifer.nix
+37 -13
@@ -7,8 +7,8 @@
7
8 boot.loader.grub.device = "/dev/sda";
9 boot.loader.grub.copyKernels = true;
10 - boot.initrd.kernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix" "megaraid_sas" "usbhid" ];
11 - boot.kernelModules = ["acpi-cpufreq" "kvm-intel" "coretemp"];
10 + boot.initrd.kernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix" "megaraid_sas" "usbhid" ];
11 + boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
12
13 fileSystems =
14 [ { mountPoint = "/";
@@ -19,22 +19,46 @@
19 }
20 ];
21
22 + services.nfsKernel.server.enable = true;
23 + services.nfsKernel.server.exports =
24 + ''
25 + /data/releases 192.168.1.0/255.255.255.0(ro,no_root_squash,fsid=0)
26 + '';
27 +
28 nixpkgs.config.subversion.pythonBindings = true;
29
24 - services.hydraChannelMirror.enable = true;
30 + #services.hydraChannelMirror.enable = true;
31 services.hydraChannelMirror.period = "0-59/15 * * * *";
32
33 + /*
34 services.httpd.enable = true;
35 services.httpd.adminAddr = "rob.vermaas@gmail.com";
29 - services.httpd.virtualHosts = [
30 - { hostName = "localhost";
31 - servedDirs = [
32 - { urlPath = "/releases";
33 - dir = "/data/hydra-mirror/channels/";
34 - }
35 - ];
36 - }
37 - ];
36 + */
37
39 -}
38 + services.postgresql = {
39 + enable = true;
40 + enableTCPIP = true;
41 + dataDir = "/data/postgresql";
42 + authentication =
43 + ''
44 + local all mediawiki ident mediawiki-users
45 + local all all ident sameuser
46 + host all all 127.0.0.1/32 md5
47 + host all all ::1/128 md5
48 + host all all 192.168.1.0/24 md5
49 + '';
50 + };
51
52 + nix.gc.automatic = true;
53 + nix.gc.options = "--max-freed $((100 * 1024**3))";
54 +
55 + services.tomcat = {
56 + enable = true;
57 + baseDir = "/data/tomcat";
58 + javaOpts =
59 + "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m -Xss8m -Xmx1024m -XX:MaxPermSize=512M -XX:PermSize=512M -XX:-UseGCOverheadLimit "
60 + + "-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 "
61 + + "-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/tomcat/logs/java_pid<pid>.hprof";
62 + };
63 +
64 +}