philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

336 commits

Author SHA1 Message Date
Eelco Dolstra c44475b085 * Start klogd to send kernel log messages to syslogd. 
svn path=/nixos/trunk/; revision=11781
 2008-05-08 13:47:44 +00:00
Eelco Dolstra 6f64c4ee0d * syslogd: print messages in the local time zone. 
* dhcpd: log to facility "local1".
* syslogd: send "local1" messages to /var/log/dhcpd, and "mail" 
  messages to /var/log/mail.

svn path=/nixos/trunk/; revision=11780
 2008-05-08 12:27:01 +00:00
Eelco Dolstra 5d5f48af83 * Some robots blocks. 
svn path=/nixos/trunk/; revision=11762
 2008-05-06 08:04:28 +00:00
Marc Weber 7a7582ec01 * added extraModules apache configuration option 
Eelco, can your review this patch ?
I hope it fits your design - if not revert it
This way we can drop the mod_php option (See example)

svn path=/nixos/trunk/; revision=11734
 2008-04-27 23:56:51 +00:00
Michael Raskin 7ee619f83d Typo fix & NameVirtualHost generation 
svn path=/nixos/trunk/; revision=11710
 2008-04-24 18:32:05 +00:00
Eelco Dolstra 5dbe45bfea * Modified the SSL configuration a bit. Instead of having a httpPort 
and a httpsPort, there are now options "port" and "enableSSL".  So
  to get https you should typically set up a vhost like this:

    virtualHosts = [
      { hostName = "foo.example.org";
        enableSSL = true;
        sslServerCert = "...";
        sslServerKey = "...";
      }
    ];

* sslServerCert and sslServerKey can be set per vhost.  This is
  currently only useful when doing IP-based vhosting.

* enableUserDir is now a per-vhost setting, as it should be.

* Convenience option globalRedirect to redirect the entire host to
  some URL.

svn path=/nixos/trunk/; revision=11704
 2008-04-24 11:56:38 +00:00
Eelco Dolstra 10bdceaaad * Allow disambiguation between the admin scripts of multiple 
Subversion service instances.

svn path=/nixos/trunk/; revision=11701
 2008-04-24 11:42:50 +00:00
Eelco Dolstra fc236567c2 * Forgot to add (even though the twiki config is not general enough yet). 
svn path=/nixos/trunk/; revision=11700
 2008-04-24 11:40:11 +00:00
Nicolas Pierron 38874d8025 Add options to hide the cursor and define the default user. 
svn path=/nixos/trunk/; revision=11664
 2008-04-21 13:05:35 +00:00
Michael Raskin 8fd2404adf Lots of fixes to Apache HTTPD configuration. Net result: I can have SSL-only SVN repository on :12443 and SSL-enabled http server with userDirs. 
svn path=/nixos/trunk/; revision=11660
 2008-04-19 10:21:42 +00:00
Michael Raskin 02decddeb1 Added possibility to use names instead of full paths in httpd subservices. Yes, the same dirty hack again 
svn path=/nixos/trunk/; revision=11615
 2008-04-13 09:35:18 +00:00
Michael Raskin 5e1ee10f3c HTTPS support in httpd upstart job fixed. 
svn path=/nixos/trunk/; revision=11613
 2008-04-12 20:08:35 +00:00
Michael Raskin bfa0e51ee5 Added possibility to modify Xorg passed to upstart-job and xlaunch 
svn path=/nixos/trunk/; revision=11555
 2008-04-11 09:20:39 +00:00
Eelco Dolstra 10cc22203e * No longer needed. 
svn path=/nixos/trunk/; revision=11538
 2008-04-10 09:14:55 +00:00
Michael Raskin 8c4ebbd24a Some tweaks for Gateway6 job 
svn path=/nixos/trunk/; revision=11496
 2008-04-08 21:41:01 +00:00
Eelco Dolstra 3979844e22 * Purify syslog.conf (it doesn't have to be in /etc). 
svn path=/nixos/trunk/; revision=11436
 2008-04-01 12:50:47 +00:00
Ludovic Courtès a0fc21eda3 Add `atd' Upstart job. 
svn path=/nixos/trunk/; revision=11435
 2008-04-01 10:16:35 +00:00
Ludovic Courtès 3957962cf9 BitlBee: Run as bitlbee' instead of root'. 
svn path=/nixos/trunk/; revision=11292
 2008-03-26 16:42:57 +00:00
Ludovic Courtès f9cbd6e640 avahi-daemon: Start on `network-interfaces/started'. 
svn path=/nixos/trunk/; revision=11291
 2008-03-26 16:41:31 +00:00
Tobias Hammerschmidt 6ce57e3117 use new ForkDaemon mode (introduced in bitlbee 1.2) instead of Daemon mode 
svn path=/nixos/trunk/; revision=11284
 2008-03-26 07:42:44 +00:00
Marc Weber 3b603a2281 synergyc ip last arg fix 
svn path=/nixos/trunk/; revision=11280
 2008-03-25 00:14:05 +00:00
Marc Weber 0fbd66414a enhanced error reporting missing config attr (new job proposal) 
svn path=/nixos/trunk/; revision=11279
 2008-03-25 00:06:58 +00:00
Michael Raskin 060533c8a1 Fixes to OpenFire 
svn path=/nixos/trunk/; revision=11264
 2008-03-22 17:54:13 +00:00
Eelco Dolstra 3703cd13a2 * Quick hack to make HAL start properly. 
svn path=/nixos/trunk/; revision=11262
 2008-03-22 16:05:01 +00:00
Marc Weber 3afeae0c00 tightvnc service (there might still be some things to improve.. I can run it - has xfs check :) 
svn path=/nixos/trunk/; revision=11243
 2008-03-20 18:34:14 +00:00
Eelco Dolstra 2cc2831563 * Indentation. 
svn path=/nixos/trunk/; revision=11231
 2008-03-20 14:38:49 +00:00
Marc Weber 465a66ab3f renamed newProposal directory 
added two example jobs

svn path=/nixos/trunk/; revision=11146
 2008-03-16 15:52:52 +00:00
Marc Weber e4757b33b1 removed trace lines, Thanks raskin 
svn path=/nixos/trunk/; revision=11144
 2008-03-16 11:03:03 +00:00
Marc Weber 40d9d62879 added mkOption extraConfig for httpd apache service 
( added \n in config concatenation as well )
added serviceProposal, examples see upstart-jobs/newProposal/*.nix
  enhancement: everything belonging to one job is within the same file 
  (was: upstart-jobs/default.nix, options.nix and the job file)
  drawback: options won't be included within the manual 
            (can be fixed see comments in options.nix)
  comment: looking at the funtion newProposalJobs maybe it's overkill? 
           Hope it pays off if we start having dozens of small different services..


svn path=/nixos/trunk/; revision=11141
 2008-03-16 01:05:40 +00:00
Ludovic Courtès cf16b3acfe Add `portmap' job. 
svn path=/nixos/trunk/; revision=11140
 2008-03-15 23:40:44 +00:00
Sander van der Burg 6c8bae53c1 Added PermitRootLogin option for sshd 
svn path=/nixos/trunk/; revision=11121
 2008-03-14 12:53:14 +00:00
Sander van der Burg 5005c49e45 Added forgotten documentRoot variable 
svn path=/nixos/trunk/; revision=11081
 2008-03-12 12:21:12 +00:00
Nicolas Pierron 58240dc30d Add the option xkbModel in the xserver. 
svn path=/nixos/trunk/; revision=11041
 2008-03-10 17:33:13 +00:00
Nicolas Pierron 5240c13bd2 * Enable halting and rebooting with slim. (type halt or reboot as login and the root password) 
svn path=/nixos/trunk/; revision=11040
 2008-03-10 17:27:37 +00:00
Ludovic Courtès 9650b0859e Fix `avahi-daemon' Upstart job. 
svn path=/nixos/trunk/; revision=11002
 2008-03-06 20:56:50 +00:00
Ludovic Courtès 43a4353c67 Add support for the Avahi daemon. 
The daemon starts correctly but, for some reason, clients fail
to connect to it.

svn path=/nixos/trunk/; revision=10999
 2008-03-06 17:11:22 +00:00
Ludovic Courtès 3cde6bd187 Add support for lshd (SSH2 daemon of GNU lsh). 
svn path=/nixos/trunk/; revision=10969
 2008-03-05 16:03:09 +00:00
Michael Raskin cedc8aaf58 Now public key is copied to store (and its hash affects derivation hash) 
svn path=/nixos/trunk/; revision=10954
 2008-03-04 16:06:33 +00:00
Michael Raskin e48a01523f Gateway6 upstart job update. 
svn path=/nixos/trunk/; revision=10953
 2008-03-04 15:30:54 +00:00
Eelco Dolstra 65deea6610 * dbus-uuidgen is now in dbus.tools. Also, a quick hack to get 
DBus clients working again: they expect dbus-launch in the 
  dbus.daemon prefix, where it no longer is.  Fortunately they
  also search in the path.  But a better fix is to move dbus-launch
  to dbus.daemon.

svn path=/nixos/trunk/; revision=10951
 2008-03-04 14:58:48 +00:00
Eelco Dolstra 8b98c3b125 svn path=/nixos/trunk/; revision=10947 2008-03-04 13:37:52 +00:00
Michael Raskin c0dd88a973 Added openfire upstart job. Note: after enabling it first time, go 127.0.0.1:9090 to configure it! 
svn path=/nixos/trunk/; revision=10930
 2008-03-03 19:28:10 +00:00
Eelco Dolstra c4617e5b04 svn path=/nixos/trunk/; revision=10853 2008-02-25 13:30:23 +00:00
Eelco Dolstra d5c09f9b61 * Clear args (NIXPKGS-86). 
svn path=/nixos/trunk/; revision=10852
 2008-02-25 13:20:00 +00:00
Eelco Dolstra 3dcd0cc7a4 * stdenvUsingSetupNew2 -> stdenv. 
svn path=/nixos/trunk/; revision=10850
 2008-02-25 12:43:38 +00:00
Michael Raskin 59ea75d88e !!! Important notice. This commit should be already done at the time of nixpkgs-stdenv-updates-merge going to trunk. This commit should be reverted if you are using old nixpkgs trunk. I hope there will be no commits to nixos/ before merger... 
svn path=/nixos/trunk/; revision=10824
 2008-02-22 03:08:26 +00:00
Eelco Dolstra ebea2dafa1 * Quick hack to get the old Apache job working. 
svn path=/nixos/trunk/; revision=10785
 2008-02-20 17:03:48 +00:00
Eelco Dolstra 50800ad3b5 svn path=/nixos/trunk/; revision=10781 2008-02-20 13:29:08 +00:00
Eelco Dolstra 705c2d36db svn path=/nixos/trunk/; revision=10777 2008-02-20 12:54:17 +00:00
Tobias Hammerschmidt 672d293c2b Added support for the Zydas zd1211 firmware. 
svn path=/nixos/trunk/; revision=10763
 2008-02-20 09:01:26 +00:00
Eelco Dolstra 8b165fc1f4 * Allow subservices to declare a script that will be run before 
the server start.  Useful to initialise necessary state.

svn path=/nixos/trunk/; revision=10761
 2008-02-19 17:37:05 +00:00
Eelco Dolstra 5d2435d460 * Top-level redirect to the repoman. 
svn path=/nixos/trunk/; revision=10758
 2008-02-19 16:52:24 +00:00
Eelco Dolstra 20881fe84b * Indentation. 
svn path=/nixos/trunk/; revision=10757
 2008-02-19 16:52:08 +00:00
Eelco Dolstra a2c20a9d29 * Virtual hosts: inherit adminAddr from the main server. 
svn path=/nixos/trunk/; revision=10756
 2008-02-19 14:54:19 +00:00
Eelco Dolstra d7dd9179ce * Allow aliases for each virtual host. 
svn path=/nixos/trunk/; revision=10754
 2008-02-19 14:41:20 +00:00
Ludovic Courtès 5122633592 Add support for Intel's 4965AGN firmware. 
svn path=/nixos/trunk/; revision=10735
 2008-02-18 16:50:08 +00:00
Eelco Dolstra bbbef0f2fa * extraDirectores -> extraConfig. 
svn path=/nixos/trunk/; revision=10731
 2008-02-18 15:00:26 +00:00
Eelco Dolstra 8a1d362447 * Postgres job: start postgres directly, don't use the old control 
script from the services tree.

svn path=/nixos/trunk/; revision=10722
 2008-02-18 11:56:43 +00:00
Ludovic Courtès b98cb9a770 Add BitlBee Upstart job in deamon mode. 
svn path=/nixos/trunk/; revision=10720
 2008-02-18 09:15:10 +00:00
Eelco Dolstra a9281eae63 * Put the static files for the Subversion service in a separate directory. 
svn path=/nixos/trunk/; revision=10697
 2008-02-14 20:59:04 +00:00
Eelco Dolstra 7563d6e144 svn path=/nixos/trunk/; revision=10693 2008-02-14 20:14:57 +00:00
Eelco Dolstra a06b51f895 svn path=/nixos/trunk/; revision=10692 2008-02-14 19:47:17 +00:00
Eelco Dolstra ffd96f07fe svn path=/nixos/trunk/; revision=10689 2008-02-14 14:29:21 +00:00
Eelco Dolstra b9d01830d3 * In a vhost, merge in the robots.txt for the main server. 
svn path=/nixos/trunk/; revision=10688
 2008-02-14 14:14:39 +00:00
Eelco Dolstra 44fceb9c4d svn path=/nixos/trunk/; revision=10686 2008-02-14 13:37:09 +00:00
Eelco Dolstra 94937ba2aa * Support for declaring virtual hosts, like 
httpd = {
      ...
      virtualHosts = [
        { hostName = "foo";
          documentRoot = "/data/webroot-foo";
          ...
        }
        { hostName = "bar";
          documentRoot = "/data/webroot-bar";
          ...
        }
      ];
    };

  Each virtual host can specify almost any option also permitted in
  the top-level httpd configuration.

svn path=/nixos/trunk/; revision=10682
 2008-02-14 13:20:26 +00:00
Eelco Dolstra f6fce91cb2 * Allow httpd subservices to declare options locally. 
* Allow multiple instantiations of a subservice (for instance,
  multiple Subversion subservices in the same Apache server).

svn path=/nixos/trunk/; revision=10675
 2008-02-14 09:54:25 +00:00
Eelco Dolstra 18123c08ca * Refactoring. 
svn path=/nixos/trunk/; revision=10671
 2008-02-14 07:42:52 +00:00
Eelco Dolstra 6e06b11097 svn path=/nixos/trunk/; revision=10643 2008-02-12 12:56:39 +00:00
Eelco Dolstra eca9242918 svn path=/nixos/trunk/; revision=10624 2008-02-11 11:51:51 +00:00
Sander van der Burg 390d2adb91 Modified variable names to follow the standard convention 
svn path=/nixos/trunk/; revision=10544
 2008-02-07 14:02:38 +00:00
Sander van der Burg 7fad8dc1b9 Changed some variable names to follow the standard convention 
svn path=/nixos/trunk/; revision=10542
 2008-02-07 13:37:20 +00:00
Sander van der Burg 76897682c4 Added vsftpd upstart job 
svn path=/nixos/trunk/; revision=10540
 2008-02-07 12:41:18 +00:00
Eelco Dolstra 8bf1cade68 * New-style Subversion server configuration. 
svn path=/nixos/trunk/; revision=10508
 2008-02-05 16:25:07 +00:00
Sander van der Burg 90f34e204d Added ejabberd service 
svn path=/nixos/trunk/; revision=10495
 2008-02-04 13:40:01 +00:00
Eelco Dolstra 707e515f82 * Option to enable support for the WIS GO7007. 
svn path=/nixos/trunk/; revision=10491
 2008-02-04 10:52:58 +00:00
Eelco Dolstra 9802ed58ee * hardware-scan: load modules for all supported USB devices 
automatically.  Of course this should be triggered when
  a USB device is plugged in (from udev).

svn path=/nixos/trunk/; revision=10451
 2008-02-01 21:50:29 +00:00
Eelco Dolstra b078ef6c70 * Cron: set TZ. 
svn path=/nixos/trunk/; revision=10449
 2008-02-01 13:56:36 +00:00
Eelco Dolstra 0d50031a0a * Periodically update the locate database from cron when 
config.services.locate.enable is set.

svn path=/nixos/trunk/; revision=10448
 2008-02-01 12:35:51 +00:00
Eelco Dolstra 9f62e1a6a5 * Declarative specification of the system cron jobs. Ideally 
this would abstract over the Crontab syntax though.

svn path=/nixos/trunk/; revision=10447
 2008-02-01 12:01:27 +00:00
Sander van der Burg 406d3aafc5 Added deploydir to tomcat service 
svn path=/nixos/trunk/; revision=10407
 2008-01-30 14:38:27 +00:00
Sander van der Burg c1f619a087 Added tomcat service to NixOS 
svn path=/nixos/trunk/; revision=10403
 2008-01-30 11:00:59 +00:00
Sander van der Burg b3ff0f8a59 Added tomcat service to NixOS 
svn path=/nixos/trunk/; revision=10402
 2008-01-30 11:00:00 +00:00
Sander van der Burg 1727c4bd3b Added mod_jk module to apache httpd 
svn path=/nixos/trunk/; revision=10310
 2008-01-28 15:40:29 +00:00
Sander van der Burg 8d5884e01f Added JBoss service 
svn path=/nixos/trunk/; revision=10309
 2008-01-28 15:16:14 +00:00
Sander van der Burg f38ed802a6 Added MySQL to NixOS 
svn path=/nixos/trunk/; revision=10306
 2008-01-28 14:34:29 +00:00
Sander van der Burg a73c26875a Added MySQL service to NixOS 
svn path=/nixos/trunk/; revision=10305
 2008-01-28 14:30:18 +00:00
Michael Raskin 01004362f2 Now xfs job fails without enableFontDir. 
svn path=/nixos/trunk/; revision=10279
 2008-01-24 21:35:24 +00:00
Yury G. Kudryashov 8f503d7302 typo in upstart-jobs/xfs.nix fixed 
svn path=/nixos/trunk/; revision=10278
 2008-01-24 20:37:27 +00:00
Michael Raskin 7749d93524 Added extraInitrdKernelModules option to CD 
svn path=/nixos/trunk/; revision=10182
 2008-01-16 21:56:31 +00:00
Andres Löh e893328176 * added xmonad to possible windowManager choices in xserver.nix 
svn path=/nixos/trunk/; revision=10180
 2008-01-16 16:49:22 +00:00
Eelco Dolstra d9ffa7f72e * Manual bug. 
svn path=/nixos/trunk/; revision=10179
 2008-01-16 15:33:09 +00:00
Eelco Dolstra 622734b58b * Generate /etc/ssh/ssh_config, set ForwardX11 and XAuthLocation. 
svn path=/nixos/trunk/; revision=10177
 2008-01-16 13:59:03 +00:00
Michael Raskin e8ddb6fd2d Samba service; httpd/xfs dependencies changed to know about gw6c.autorun option. 
svn path=/nixos/trunk/; revision=10140
 2008-01-14 11:24:36 +00:00
Eelco Dolstra 26e0f711a9 * Use the aggregator to combine the kernel modules tree with 
externally-built modules so that (e.g.) "modprobe nvidia" Just
  Works.

svn path=/nixos/trunk/; revision=10129
 2008-01-12 23:37:17 +00:00
Eelco Dolstra cfed953b5f * Option to enable the Intel 3945 firmware. (It's enabled by 
default since it doesn't seem to have the legal issues of
  the Intel 2200 firmware.)
* Firmware loader: don't write in /tmp.  Also a hack to quickly
  test new firmwares.
* Revert r10105 since the build fails if configuration.nix 
  is a symlink.  Anyway copying configuration.nix does not
  necessarily make sense since it can import other expressions,
  which would also have to be copied.  Perhaps a better 
  approach would be to write a serialisation of the config
  to a file (maybe with builtins.toXML).

svn path=/nixos/trunk/; revision=10127
 2008-01-12 22:53:13 +00:00
Michael Raskin 4475a74fb8 LiveDVD with X and sources made. 
svn path=/nixos/trunk/; revision=10119
 2008-01-11 16:59:39 +00:00
Michael Raskin a11779f912 Gw6c now can be configured not to start automatically 
svn path=/nixos/trunk/; revision=10116
 2008-01-11 06:36:15 +00:00
Michael Raskin a4ff40b158 Added kqemu 0666 permissions 
svn path=/nixos/trunk/; revision=10097
 2008-01-08 00:16:49 +00:00
Eelco Dolstra a2c1282ebc * Get rid of some unnecessary xorg.conf statements. 
svn path=/nixos/trunk/; revision=10096
 2008-01-07 23:12:02 +00:00