Author: eelco
Date: Fri Nov 26 22:50:08 2010
New Revision: 24886
URL: https://svn.nixos.org/websvn/nix/?rev=24886&sc=1
Log:
Modified:
configurations/trunk/tud/common.nix
configurations/trunk/tud/lucifer.nix
Modified: configurations/trunk/tud/common.nix
==============================================================================
--- configurations/trunk/tud/common.nix Fri Nov 26 20:08:14 2010 (r24885)
+++ configurations/trunk/tud/common.nix Fri Nov 26 22:50:08 2010 (r24886)
@@ -3,7 +3,10 @@
{
boot.kernelModules = [ "coretemp" ];
- environment.systemPackages = [ pkgs.emacs pkgs.subversion pkgs.sysstat
pkgs.hdparm pkgs.sdparm pkgs.lsiutil ];
+ environment.systemPackages =
+ [ pkgs.emacs pkgs.subversion pkgs.sysstat pkgs.hdparm pkgs.sdparm
pkgs.lsiutil
+ pkgs.htop
+ ];
services.sshd.enable = true;
Modified: configurations/trunk/tud/lucifer.nix
==============================================================================
--- configurations/trunk/tud/lucifer.nix Fri Nov 26 20:08:14 2010
(r24885)
+++ configurations/trunk/tud/lucifer.nix Fri Nov 26 22:50:08 2010
(r24886)
@@ -7,8 +7,8 @@
boot.loader.grub.device = "/dev/sda";
boot.loader.grub.copyKernels = true;
- boot.initrd.kernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix"
"megaraid_sas" "usbhid" ];
- boot.kernelModules = ["acpi-cpufreq" "kvm-intel" "coretemp"];
+ boot.initrd.kernelModules = [ "uhci_hcd" "ehci_hcd" "ata_piix"
"megaraid_sas" "usbhid" ];
+ boot.kernelModules = [ "acpi-cpufreq" "kvm-intel" ];
fileSystems =
[ { mountPoint = "/";
@@ -19,22 +19,46 @@
}
];
+ services.nfsKernel.server.enable = true;
+ services.nfsKernel.server.exports =
+ ''
+ /data/releases 192.168.1.0/255.255.255.0(ro,no_root_squash,fsid=0)
+ '';
+
nixpkgs.config.subversion.pythonBindings = true;
- services.hydraChannelMirror.enable = true;
+ #services.hydraChannelMirror.enable = true;
services.hydraChannelMirror.period = "0-59/15 * * * *";
+ /*
services.httpd.enable = true;
services.httpd.adminAddr = "[email protected]";
- services.httpd.virtualHosts = [
- { hostName = "localhost";
- servedDirs = [
- { urlPath = "/releases";
- dir = "/data/hydra-mirror/channels/";
- }
- ];
- }
- ];
+ */
-}
+ services.postgresql = {
+ enable = true;
+ enableTCPIP = true;
+ dataDir = "/data/postgresql";
+ authentication =
+ ''
+ local all mediawiki ident mediawiki-users
+ local all all ident sameuser
+ host all all 127.0.0.1/32 md5
+ host all all ::1/128 md5
+ host all all 192.168.1.0/24 md5
+ '';
+ };
+
+ nix.gc.automatic = true;
+ nix.gc.options = "--max-freed $((100 * 1024**3))";
+
+ services.tomcat = {
+ enable = true;
+ baseDir = "/data/tomcat";
+ javaOpts =
+ "-Dshare.dir=/nix/var/nix/profiles/default/share -Xms350m -Xss8m
-Xmx1024m -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";
+ };
+}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
