* Put the mail server configuration in common.nix.
svn path=/configurations/trunk/tud/; revision=24219
Eelco Dolstra committed
Oct 11, 2010 at 18:00 UTC
85c5ba82b4d8c72abd71038b86357afc9f21cb49
4 files changed
+6
-19
cartman.nix
-6
@@ -104,12 +104,6 @@ rec {
104
105
echo 1 > /proc/sys/net/ipv4/ip_forward
106
'';
107
-
108
- defaultMailServer = {
109
- directDelivery = true;
110
- hostName = "smtp.st.ewi.tudelft.nl";
111
- domain = "st.ewi.tudelft.nl";
112
- };
107
};
108
109
services = {
common.nix
+6
@@ -29,4 +29,10 @@
29
UserParameter=hardware.temp.cpu.average,cat /sys/devices/platform/coretemp.*/temp1_input | ${pkgs.perl}/bin/perl -e 'while (<>) { $n++; $sum += $_; }; print $sum / $n / 1000;'
30
UserParameter=vm.memory.dirty,echo $((1024 * $(cat /proc/meminfo | sed 's/Dirty: *\([0-9]\+\) kB/\1/; t; d')))
31
'';
32
+
33
+ networking.defaultMailServer = {
34
+ directDelivery = true;
35
+ hostName = "smtp.st.ewi.tudelft.nl";
36
+ domain = "st.ewi.tudelft.nl";
37
+ };
38
}
hydra.nix
-6
@@ -67,12 +67,6 @@ in
67
extraHosts =
68
let toHosts = m: "${m.ipAddress} ${m.hostName} ${pkgs.lib.concatStringsSep " " (if m ? aliases then m.aliases else [])}\n"; in
69
pkgs.lib.concatStrings (map toHosts machines);
70
-
71
- defaultMailServer = {
72
- directDelivery = true;
73
- hostName = "smtp.st.ewi.tudelft.nl";
74
- domain = "st.ewi.tudelft.nl";
75
- };
70
};
71
72
services.cron.systemCronJobs =
webdsl.nix
-7
@@ -226,13 +226,6 @@ in
226
nameservers = [ "130.161.158.4" "130.161.158.133" ];
227
228
useDHCP = false;
229
-
230
- defaultMailServer = {
231
- directDelivery = true;
232
- hostName = "smtp.st.ewi.tudelft.nl";
233
- domain = "st.ewi.tudelft.nl";
234
- };
235
-
229
};
230
231
environment.systemPackages = [ pkgs.stdenv pkgs.lsiutil ] ++ (with pkgs.strategoPackages018; [ aterm sdf strategoxt ]) ;