@cryptotaxi247 / infra / commits / 9ee6b3be

* www.stratego-language.org, www.strategoxt.org: redirect to strategoxt.org. * A new virtual host svn.strategoxt.org providing Subversion repos for Stratego/XT.

* www.stratego-language.org, www.strategoxt.org: redirect to strategoxt.org. * A new virtual host svn.strategoxt.org providing Subversion repos for Stratego/XT. svn path=/configurations/trunk/tud/; revision=10759

Eelco Dolstra committed Feb 19, 2008 at 16:56 UTC 9ee6b3be90a63ee1fa42cfb8d9bc8f50a269845c
1 file changed +27 -3
main.nix
+27 -3
@@ -119,7 +119,7 @@ rec {
119
120 cron = {
121 systemCronJobs = [
122 - "25 * * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv --numeric-ids --delete /data/subversion /data/vm /data/pt-wiki /data/postgresql unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
122 + "25 * * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv --numeric-ids --delete /data/subversion /data/subversion-strategoxt /data/vm /data/pt-wiki /data/postgresql unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
123 ];
124 };
125
@@ -237,6 +237,7 @@ rec {
237 { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
238 config = {
239 urlPrefix = "";
240 + toplevelRedirect = false;
241 dataDir = "/data/subversion";
242 notificationSender = "root@buildfarm.st.ewi.tudelft.nl";
243 userCreationDomain = "st.ewi.tudelft.nl";
@@ -268,9 +269,7 @@ rec {
269 ];
270 }
271
271 - # !!! hacky
272 { hostName = "strategoxt.org";
273 - serverAliases = ["www.strategoxt.org" "www.stratego-language.org"];
273 extraSubservices = [
274 { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/twiki.nix;
275 config = { startWeb = "Stratego/WebHome"; };
@@ -278,6 +277,31 @@ rec {
277 ];
278 }
279
280 + { hostName = "www.strategoxt.org";
281 + serverAliases = ["www.stratego-language.org"];
282 + extraConfig = ''
283 + RedirectPermanent / http://strategoxt.org/
284 + '';
285 + }
286 +
287 + { hostName = "svn.strategoxt.org";
288 + extraSubservices = [
289 + { function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
290 + config = {
291 + urlPrefix = "";
292 + dataDir = "/data/subversion-strategoxt";
293 + notificationSender = "root@buildfarm.st.ewi.tudelft.nl";
294 + userCreationDomain = "st.ewi.tudelft.nl";
295 + organisation = {
296 + name = "Stratego/XT";
297 + url = http://strategoxt.org/;
298 + logo = "http://strategoxt.org/pub/Stratego/StrategoLogo/StrategoLogoTextlessWhite-100px.png";
299 + };
300 + };
301 + }
302 + ];
303 + }
304 +
305 { hostName = "program-transformation.org";
306 serverAliases = ["www.program-transformation.org"];
307 extraSubservices = [