Fix vhost, delete *.tmplc
Eelco Dolstra committed
Jul 24, 2013 at 00:30 UTC
b8af087fc0fb2ffa4facc7a1605a3f750de1c75a
4 files changed
+11
-13
nixos-org/theme/index.html.tmplc
Binary files a/nixos-org/theme/index.html.tmplc and /dev/null differ
nixos-org/theme/rss10.xml.tmplc
Binary files a/nixos-org/theme/rss10.xml.tmplc and /dev/null differ
nixos-org/theme/rss20.xml.tmplc
Binary files a/nixos-org/theme/rss20.xml.tmplc and /dev/null differ
nixos-org/webserver.nix
+11
-13
@@ -37,12 +37,6 @@ let
37
}
38
];
39
40
- virtualHosts =
41
- [ { documentRoot = "/var/www/planet.nixos.org";
42
- hostName = "planet.nixos.org";
43
- }
44
- ];
45
-
40
extraConfig =
41
''
42
#<Proxy *>
@@ -178,6 +172,10 @@ in
172
documentRoot = "/tarballs";
173
}
174
175
+ { hostName = "planet.nixos.org";
176
+ documentRoot = "/var/www/planet.nixos.org";
177
+ }
178
+
179
# Obsolete, kept for backwards compatibility.
180
{ hostName = "svn.nixos.org";
181
globalRedirect = "https://nixos.org/repoman";
@@ -190,6 +188,7 @@ in
188
Redirect / https://nixos.org/
189
'';
190
}
191
+
192
];
193
};
194
@@ -295,13 +294,12 @@ in
294
enable = true;
295
outputTheme = ./theme;
296
outputDirectory = "/var/www/planet.nixos.org";
298
- feeds = [
299
- {
300
- name = "Rok Garbas";
301
- feedUrl = "http://garbas.si/blog/category/latest-plone/RSS";
302
- homepageUrl= "http://blog.garbas.si";
303
- }
304
- ];
297
+ feeds =
298
+ [ { name = "Rok Garbas";
299
+ feedUrl = "http://garbas.si/blog/category/latest-nixos/RSS";
300
+ homepageUrl= "http://blog.garbas.si";
301
+ }
302
+ ];
303
};
304
305
}