Author: eelco
Date: Mon Oct 11 18:00:35 2010
New Revision: 24219
URL: https://svn.nixos.org/websvn/nix/?rev=24219&sc=1
Log:
* Put the mail server configuration in common.nix.
Modified:
configurations/trunk/tud/cartman.nix
configurations/trunk/tud/common.nix
configurations/trunk/tud/hydra.nix
configurations/trunk/tud/webdsl.nix
Modified: configurations/trunk/tud/cartman.nix
==============================================================================
--- configurations/trunk/tud/cartman.nix Mon Oct 11 17:12:00 2010
(r24218)
+++ configurations/trunk/tud/cartman.nix Mon Oct 11 18:00:35 2010
(r24219)
@@ -104,12 +104,6 @@
echo 1 > /proc/sys/net/ipv4/ip_forward
'';
-
- defaultMailServer = {
- directDelivery = true;
- hostName = "smtp.st.ewi.tudelft.nl";
- domain = "st.ewi.tudelft.nl";
- };
};
services = {
Modified: configurations/trunk/tud/common.nix
==============================================================================
--- configurations/trunk/tud/common.nix Mon Oct 11 17:12:00 2010 (r24218)
+++ configurations/trunk/tud/common.nix Mon Oct 11 18:00:35 2010 (r24219)
@@ -29,4 +29,10 @@
UserParameter=hardware.temp.cpu.average,cat
/sys/devices/platform/coretemp.*/temp1_input | ${pkgs.perl}/bin/perl -e 'while
(<>) { $n++; $sum += $_; }; print $sum / $n / 1000;'
UserParameter=vm.memory.dirty,echo $((1024 * $(cat /proc/meminfo | sed
's/Dirty: *\([0-9]\+\) kB/\1/; t; d')))
'';
+
+ networking.defaultMailServer = {
+ directDelivery = true;
+ hostName = "smtp.st.ewi.tudelft.nl";
+ domain = "st.ewi.tudelft.nl";
+ };
}
Modified: configurations/trunk/tud/hydra.nix
==============================================================================
--- configurations/trunk/tud/hydra.nix Mon Oct 11 17:12:00 2010 (r24218)
+++ configurations/trunk/tud/hydra.nix Mon Oct 11 18:00:35 2010 (r24219)
@@ -67,12 +67,6 @@
extraHosts =
let toHosts = m: "${m.ipAddress} ${m.hostName}
${pkgs.lib.concatStringsSep " " (if m ? aliases then m.aliases else [])}\n"; in
pkgs.lib.concatStrings (map toHosts machines);
-
- defaultMailServer = {
- directDelivery = true;
- hostName = "smtp.st.ewi.tudelft.nl";
- domain = "st.ewi.tudelft.nl";
- };
};
services.cron.systemCronJobs =
Modified: configurations/trunk/tud/webdsl.nix
==============================================================================
--- configurations/trunk/tud/webdsl.nix Mon Oct 11 17:12:00 2010 (r24218)
+++ configurations/trunk/tud/webdsl.nix Mon Oct 11 18:00:35 2010 (r24219)
@@ -226,13 +226,6 @@
nameservers = [ "130.161.158.4" "130.161.158.133" ];
useDHCP = false;
-
- defaultMailServer = {
- directDelivery = true;
- hostName = "smtp.st.ewi.tudelft.nl";
- domain = "st.ewi.tudelft.nl";
- };
-
};
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
