Author: eelco
Date: Fri Oct 8 12:50:24 2010
New Revision: 24183
URL: https://svn.nixos.org/websvn/nix/?rev=24183&sc=1
Log:
Modified:
configurations/trunk/tud/cartman.nix
configurations/trunk/tud/machines.nix
configurations/trunk/tud/mass-update.sh
Modified: configurations/trunk/tud/cartman.nix
==============================================================================
--- configurations/trunk/tud/cartman.nix Fri Oct 8 12:47:03 2010
(r24182)
+++ configurations/trunk/tud/cartman.nix Fri Oct 8 12:50:24 2010
(r24183)
@@ -15,8 +15,6 @@
};
in map addKey (filter (machine: machine ? buildUser) machines);
- jiraJetty = (import ../../services/jira/jira-instance.nix).jetty;
-
myIP = "130.161.158.181";
releasesCSS = /etc/nixos/release/generic-dist/release-page/releases.css;
@@ -98,8 +96,11 @@
iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -d 192.168.1.0/24 -j
ACCEPT
iptables -t nat -A POSTROUTING -s 192.168.1.0/24 -j SNAT --to-source
${myIP}
- # losser ssh
- iptables -t nat -A PREROUTING -p tcp -i eth1 --dport 8080 -j DNAT --to
192.168.1.18:2022
+ # butters ssh
+ iptables -t nat -A PREROUTING -p tcp -i eth1 --dport 8080 -j DNAT --to
192.168.1.23:22
+
+ # stan ssh (for the SCM seminar)
+ iptables -t nat -A PREROUTING -p tcp -i eth1 --dport 2222 -j DNAT --to
192.168.1.20:22
echo 1 > /proc/sys/net/ipv4/ip_forward
'';
@@ -115,14 +116,8 @@
cron = {
mailto = "[email protected]";
systemCronJobs =
- let indexJob = hour: dir: url:
- "45 ${toString hour} * * * buildfarm (cd /etc/nixos/release/index
&& PATH=${pkgs.saxonb}/bin:$PATH ./make-index.sh ${dir} ${url} /releases.css) |
${pkgs.utillinux}/bin/logger -t index";
- in
[
"15 0 * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv
--numeric-ids --delete /data/postgresql /data/webserver/tarballs
unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
- (indexJob 02 "/data/webserver/dist/strategoxt2"
http://releases.strategoxt.org/)
- (indexJob 05 "/data/webserver/dist"
http://buildfarm.st.ewi.tudelft.nl/)
-
"00 03 * * * root ${pkgs.nixUnstable}/bin/nix-collect-garbage
--max-atime $(date +\\%s -d '2 weeks ago') > /var/log/gc.log 2>&1"
"* * * * * root ${pkgs.python}/bin/python ${ZabbixApacheUpdater}
-z 192.168.1.5 -c cartman"
];
@@ -307,8 +302,8 @@
ProxyRequests Off
ProxyPreserveHost On
- ProxyPass / http://localhost:10080/
- ProxyPassReverse / http://localhost:10080/
+ ProxyPass / http://mrkitty:10080/
+ ProxyPassReverse / http://mrkitty:10080/
'';
}
@@ -319,9 +314,6 @@
{ hostName = "nixos.org";
documentRoot = "/home/eelco/nix-homepage";
servedDirs = [
- { urlPath = "/releases";
- dir = "/data/webserver/dist/nix";
- }
{ urlPath = "/tarballs";
dir = "/data/webserver/tarballs";
}
@@ -332,6 +324,19 @@
dir = "/data/webserver/update";
}
];
+
+ extraConfig = ''
+ <Proxy *>
+ Order deny,allow
+ Allow from all
+ </Proxy>
+
+ ProxyRequests Off
+ ProxyPreserveHost On
+ ProxyPass /releases/ http://lucifer:80/releases/
+ ProxyPassReverse /releases/ http://lucifer:80/releases/
+ '';
+
servedFiles = [
{ urlPath = "/releases/css/releases.css";
file = releasesCSS;
@@ -400,42 +405,9 @@
documentRoot = "/home/karltk/public_html/planet";
}
- { hostName = "test.researchr.org";
- extraConfig = ''
- <Proxy *>
- Order deny,allow
- Allow from all
- </Proxy>
-
- ProxyRequests Off
- ProxyPreserveHost On
- ProxyPass / http://mrhankey:8080/ retry=5
- ProxyPassReverse / http://mrhankey:8080/
- '';
- }
-
- { hostName = "test.nixos.org";
- extraConfig = ''
- <Proxy *>
- Order deny,allow
- Allow from all
- </Proxy>
-
- ProxyRequests Off
- ProxyPreserveHost On
- ProxyPass / http://mrhankey:8080/ retry=5
- ProxyPassReverse / http://mrhankey:8080/
- '';
- }
-
];
};
- postgresqlBackup = {
- enable = true;
- databases = [ "jira" ];
- };
-
sitecopy = {
enable = true;
backups =
@@ -491,30 +463,6 @@
};
- users.extraUsers = singleton
- { name = "jira";
- description = "JIRA bug tracker";
- };
-
- jobs.jira =
- { description = "JIRA bug tracker";
-
- startOn = "started network-interfaces";
-
- preStart =
- ''
- mkdir -p /var/log/jetty /var/cache/jira
- chown jira /var/log/jetty /var/cache/jira
- '';
-
- exec = "${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh jira -c
'${jiraJetty}/bin/run-jetty'";
-
- postStop =
- ''
- ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh jira -c
'${jiraJetty}/bin/stop-jetty'
- '';
- };
-
# Needed for the Nixpkgs mirror script.
environment.pathsToLink = [ "/libexec" ];
Modified: configurations/trunk/tud/machines.nix
==============================================================================
--- configurations/trunk/tud/machines.nix Fri Oct 8 12:47:03 2010
(r24182)
+++ configurations/trunk/tud/machines.nix Fri Oct 8 12:50:24 2010
(r24183)
@@ -152,5 +152,20 @@
systems = [ "i386-sunos" ];
maxJobs = 2;
}
-
+
+ {
+ hostName = "drdoctor";
+ ipAddress = "192.168.1.51";
+ ethernetAddress = "00:16:3e:00:00:02";
+ systems = [ "x86_64-linux" ];
+ }
+
+ { # Legacy JIRA server, put in its own Xen ghetto because our JIRA
+ # is very old and probably insecure.
+ hostName = "mrkitty";
+ ipAddress = "192.168.1.52";
+ ethernetAddress = "00:16:3e:00:00:03";
+ systems = [ "x86_64-linux" ];
+ }
+
]
Modified: configurations/trunk/tud/mass-update.sh
==============================================================================
--- configurations/trunk/tud/mass-update.sh Fri Oct 8 12:47:03 2010
(r24182)
+++ configurations/trunk/tud/mass-update.sh Fri Oct 8 12:50:24 2010
(r24183)
@@ -1,8 +1,8 @@
#! /bin/sh -e
-export SSH_AUTH_SOCK= # hack
+#export SSH_AUTH_SOCK= # hack
-for i in jimmy timmy terrance phillip; do
+for i in ${MACHINES:-jimmy timmy stan kyle kenny}; do
echo "=== Updating $i ==="
ssh -i /root/.ssh/id_mass_update r...@$i sh --login -c '"cd /etc/nixos &&
svn up nixos nixpkgs configurations release && nixos-rebuild switch"'
done
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
