Author: maggesi
Date: Tue May 15 10:06:27 2012
New Revision: 34101
URL: https://nixos.org/websvn/nix/?rev=34101&sc=1
Log:
Reformatting dolly config
Modified:
configurations/trunk/misc/z77z/dolly.nix
Modified: configurations/trunk/misc/z77z/dolly.nix
==============================================================================
--- configurations/trunk/misc/z77z/dolly.nix Tue May 15 06:52:38 2012
(r34100)
+++ configurations/trunk/misc/z77z/dolly.nix Tue May 15 10:06:27 2012
(r34101)
@@ -3,64 +3,51 @@
{
require = [ "${modulesPath}/virtualisation/xen-domU.nix" ];
- fileSystems =
- [ { mountPoint = "/";
- label = "nixos";
- }
- ];
-
- networking = {
- hostName = "dolly";
- nameservers = [ "150.217.34.1" "150.217.34.211" ];
- defaultMailServer.directDelivery = true;
- defaultMailServer.hostName = "mail.math.unifi.it";
-
- useDHCP = false;
- interfaces = [ {
- name = "eth0";
- ipAddress = "150.217.34.130";
- subnetMask = "255.255.255.128";
- } ];
- defaultGateway = "150.217.34.129";
-
- };
-
- environment = {
- systemPackages = with pkgs; [
- emacs screen mosh
+ fileSystems = [ { mountPoint = "/"; label = "nixos"; } ];
+
+ networking =
+ { hostName = "dolly";
+ nameservers = [ "150.217.34.1" "150.217.34.211" ];
+ defaultMailServer.directDelivery = true;
+ defaultMailServer.hostName = "mail.math.unifi.it";
+
+ useDHCP = false;
+ interfaces =
+ [ { name = "eth0";
+ ipAddress = "150.217.34.130";
+ subnetMask = "255.255.255.128";
+ } ];
+ defaultGateway = "150.217.34.129";
+ };
+
+ environment.systemPackages =
+ with pkgs;
+ [ emacs screen mosh
mercurial darcs git fossil
- ocaml
- coq
- ];
- };
+ ocaml coq ];
services.locate.enable = true;
services.locate.period = "40 3 * * *";
services.openssh.enable = true;
+ services.openafsClient.enable = false;
+ services.openafsClient.cellName = "math.unifi.it";
-
-
- services.openafsClient = {
- enable = false;
- cellName = "math.unifi.it";
- };
services.postgresql.enable = true;
- services.httpd = {
- enable = true;
+ services.httpd =
+ { enable = true;
hostName = "localhost";
adminAddr = "[email protected]";
documentRoot = "/var/www";
enableUserDir = true;
/*
- servedDirs = [
- { dir = "/home/maggesi/Devel"; urlPath = "/devo"; }
- { dir = "/nix/store"; urlPath = "/store"; }
- ];
- extraModules = [
- { name = "php5"; path = "${pkgs.php}/modules/libphp5.so"; }
- ];
+ servedDirs =
+ [ { dir = "/home/maggesi/Devel"; urlPath = "/devo"; }
+ { dir = "/nix/store"; urlPath = "/store"; } ];
+ extraModules =
+ [ { name = "php5";
+ path = "${pkgs.php}/modules/libphp5.so"; } ];
extraConfig = ''
ScriptAlias /cgi-bin/ /var/www/cgi-bin/
'';
@@ -73,6 +60,4 @@
krb5.defaultRealm = "MATH.UNIFI.IT";
krb5.kdc = "kerberos.math.unifi.it";
krb5.kerberosAdminServer = "kerberos.math.unifi.it";
-
-
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
