Commit graph

103 commits

Author SHA1 Message Date
Marc Weber
8e5eeccb75 * Synced with trunk @ 15340
svn path=/nixos/branches/modular-nixos/; revision=15367
2009-04-28 13:42:43 +00:00
Marc Weber
8237528c4a samba job: put each daemon into its own job file
use start/stop samba-control to start/stop them all

You can enable syncing samba passwords when using passwd as well now.
However you still have to add a user to the samba user database once
using smbpasswd -a username.

svn path=/nixos/branches/modular-nixos/; revision=15218
2009-04-21 16:30:32 +00:00
Nicolas Pierron
9741be988c * Synced with trunk @ 15006
svn path=/nixos/branches/modular-nixos/; revision=15012
2009-04-13 11:15:19 +00:00
Michael Raskin
49bd768f99 As we do not really generate ejabbred.cfg, allow at least overwriting it manually
svn path=/nixos/trunk/; revision=15006
2009-04-13 09:35:03 +00:00
Nicolas Pierron
16a916f297 * Synced with trunk @ 14905
svn path=/nixos/branches/modular-nixos/; revision=14986
2009-04-11 22:12:02 +00:00
Nicolas Pierron
3f1dd56e9e * Synced with trunk @ 14801
svn path=/nixos/branches/modular-nixos/; revision=14953
2009-04-08 14:01:16 +00:00
Nicolas Pierron
9ba1f01479 * Synced with trunk @ 14413
svn path=/nixos/branches/modular-nixos/; revision=14951
2009-04-08 13:50:32 +00:00
Eelco Dolstra
d5e97ab056 * Let KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS contain the KDE
packages that we need rather than just /var/run/current-system/sw.
  This ensures consistency when upgrading a system (e.g. you don't end
  up with a mix of KDE versions at runtime).  This partially reverts
  r14148 (in particular the update-mime-database hack in the
  systemPath post-build).

svn path=/nixos/trunk/; revision=14887
2009-04-05 18:30:39 +00:00
Wouter den Breejen
40f38560d4 Allow samba to use PAM (needs cleartext passwords for now)
svn path=/nixos/trunk/; revision=14768
2009-03-29 21:43:40 +00:00
Marc Weber
819873d745 Convert "nix-daemon" and nix options
svn path=/nixos/branches/fix-style/; revision=14365
2009-03-06 12:25:51 +00:00
Marc Weber
b5a7c767c5 Convert "ldap" (untested)
svn path=/nixos/branches/fix-style/; revision=14362
2009-03-06 12:25:44 +00:00
Marc Weber
e344a2d055 Convert "unix-odbc-drivers"
svn path=/nixos/branches/fix-style/; revision=14359
2009-03-06 12:25:33 +00:00
Lluís Batlle i Rossell
72bb6b30b3 Adding the ftp pam service, for vsftpd.
svn path=/nixos/trunk/; revision=14287
2009-02-28 20:01:56 +00:00
Eelco Dolstra
51078ac5b7 * Support special characters in config.nix.extraOptions.
svn path=/nixos/trunk/; revision=14278
2009-02-27 14:08:38 +00:00
Eelco Dolstra
f5b2ecdc13 * Make nix-channel and nix-env work when chroots are enabled.
svn path=/nixos/trunk/; revision=14271
2009-02-27 12:03:03 +00:00
Nicolas Pierron
357ca60ed7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/branches/fix-style/; revision=14191
2009-02-22 16:09:14 +00:00
Eelco Dolstra
311ff6c8e7 * Set KDEDIRS, XDG_CONFIG_DIRS and XDG_DATA_DIRS in bashrc. This has
the advantage that KDE applications work when logging in via ssh,
  and that you don't need to logout to have KDE upgrades take effect.
  On the downside, since the various KDE packages and shared-mime-info
  all have their own MIME databases, if we put them in one symlink
  tree (systemPath), we need to rerun update-mime-database on the
  symlink tree.  Also, systemPath is getting very large.

svn path=/nixos/trunk/; revision=14148
2009-02-20 16:31:42 +00:00
Nicolas Pierron
7aa27dfee2 Merge branches 'fix-style' and 'master' into fix-style
svn path=/nixos/branches/fix-style/; revision=13688
2009-01-02 19:41:39 +00:00
Nicolas Pierron
d745c21aab Merge system/fontdir.nix and system/fonts.nix into a new configuration file.
svn path=/nixos/branches/fix-style/; revision=13686
2009-01-02 16:07:39 +00:00
Nicolas Pierron
1b32260084 Convert "upstart-jobs/xserver.nix" to a configuration file.
svn path=/nixos/branches/fix-style/; revision=13682
2009-01-02 16:07:21 +00:00
Nicolas Pierron
44f1d9f0bf Extra sudo configuration file from:
- system/options.nix
- system/system.nix
- etc/default.nix

svn path=/nixos/branches/fix-style/; revision=13681
2009-01-02 16:07:15 +00:00
Nicolas Pierron
79bfab0e07 convert "upstart-jobs/atd.nix" to a configuration file. Remove extra occurrences of "atd" from other files.
svn path=/nixos/branches/fix-style/; revision=13680
2009-01-02 16:07:10 +00:00
Nicolas Pierron
1533dec09d * etc/default.nix is now a configuration file.
* the script used to build the etc directory in stored in config.system.build.etc.
* The activation script is defined inside etc/Default.nix instead of system/activate-configuration.sh

svn path=/nixos/branches/fix-style/; revision=13676
2009-01-02 16:06:52 +00:00
Eelco Dolstra
67451c470b * Make sure that build-chroot-dirs only contains directories.
svn path=/nixos/trunk/; revision=13657
2008-12-19 10:22:45 +00:00
Eelco Dolstra
2f4b7d3e09 * Doh.
svn path=/nixos/trunk/; revision=13642
2008-12-16 00:16:35 +00:00
Eelco Dolstra
c155a3f46e * When doing chroot builds, the `build-chroot-dirs' option should
include the closure of /bin/sh.  Otherwise all builders that call
  /bin/sh will fail when using the new chroot implementation, which
  only bind-mounts the inputs of a build rather than the whole Nix
  store.

svn path=/nixos/trunk/; revision=13640
2008-12-15 23:54:10 +00:00
Ludovic Courtès
730244f13d lshd: Use `lsh-pam-checkpw' as the password helper program.
This finally allows users to log in using password authentication.

svn path=/nixos/trunk/; revision=13490
2008-11-28 15:44:15 +00:00
Nicolas Pierron
205a7431ac Remove extra arguments comming from config.*.
svn path=/nixos/branches/fix-style/; revision=13381
2008-11-23 01:29:20 +00:00
Nicolas Pierron
9c0eef3bae Convert "dbus" & "avahi-deamon" upstart-job to the fix-style.
svn path=/nixos/branches/fix-style/; revision=13378
2008-11-23 01:28:58 +00:00
Nicolas Pierron
892d12bccf - Move some system configuration to options:
* system.nssModules
  * system.modulesTree
  * system.sbin.modprobe
  * system.sbin.mount
  * nix.envVars

- Remove Arguments that can be accessed either by "config" or "pkgs".

- Use the new scheme for upstart-jobs/default.nix.
This is now a configuration file which is imported by system/options.nix.

- Jobs can now include upstart-job/default.nix:
  * upstrat-jobs/cron.nix
  * upstart-jobs/dhclient.nix

=> No Nixos file refers to upstart-jobs/default.nix except if one of its options is require to define an extra job. (e.g.: cron, dhclient)

svn path=/nixos/branches/fix-style/; revision=13327
2008-11-18 18:00:09 +00:00
Ludovic Courtès
d7c321c64a bashrc: Initialize `GST_PLUGIN_PATH' (GStreamer's plug-in search path).
svn path=/nixos/trunk/; revision=13254
2008-11-11 17:08:04 +00:00
Eelco Dolstra
d1cf5f164e * CUPS needs a PAM configuration file to allow users to authenticate
via the web interface (e.g. when adding printers).

svn path=/nixos/trunk/; revision=13214
2008-11-07 11:51:17 +00:00
Eelco Dolstra
97f5a8eda7 * Mount /dev/pts in the chroot.
svn path=/nixos/trunk/; revision=13151
2008-10-29 15:42:44 +00:00
Eelco Dolstra
1ad5997776 * Set $PERL5LIB.
svn path=/nixos/trunk/; revision=13148
2008-10-29 13:41:32 +00:00
Ludovic Courtès
f7770a6b63 In bashrc', don't add non-existent directories to ACLOCAL_PATH'.
svn path=/nixos/trunk/; revision=13033
2008-10-09 19:58:11 +00:00
Eelco Dolstra
bdb29c0bcc * Don't need/want /etc anymore in the chroot.
svn path=/nixos/trunk/; revision=12734
2008-08-27 09:49:26 +00:00
Eelco Dolstra
3e8be34fcc * Set $NIX_OTHER_STORES to /var/run/nix/remote-stores to make
automatic copying of build results from remote Nix stores work
  more-or-less automatically.  All you have to do is mount the remote
  FS on a subdirectory of /var/run/nix/remote-stores, e.g.

    $ sshfs remote_machine:/ /var/run/nix/remote-stores/foo

* Set $NIXPKGS_ALL.

svn path=/nixos/trunk/; revision=12411
2008-07-23 16:06:03 +00:00
Eelco Dolstra
5ec1fa2060 * Tabs considered harmful.
svn path=/nixos/trunk/; revision=12407
2008-07-23 14:13:27 +00:00
Eelco Dolstra
088b09f401 * Move most bash initialisation to /etc/bashrc. Now finally ssh
commands like "ssh -t host command" initialise the environment
  properly.

svn path=/nixos/trunk/; revision=12366
2008-07-16 16:01:09 +00:00
Ludovic Courtès
48ec05d257 Fix typo in /etc/profile' that led to a wrong LD_LIBRARY_PATH'.
svn path=/nixos/trunk/; revision=12332
2008-07-10 13:45:12 +00:00
Wouter den Breejen
ab41596a7f Added option boot.extraGrubEntriesBeforeNixos=true/false to boot by default into nixos-default or into your extraGrubEntries
svn path=/nixos/trunk/; revision=12263
2008-07-05 00:16:39 +00:00
Eelco Dolstra
9b55a5c178 * Generation of /etc/fonts/fonts.conf: moved to Nixpkgs.
svn path=/nixos/trunk/; revision=12252
2008-07-03 14:35:02 +00:00
Eelco Dolstra
8c7859f7fb * Make kdesktop_lock work by providing a PAM configuration for KDE
and making kcheckpass setuid root.

svn path=/nixos/trunk/; revision=12166
2008-06-20 13:32:39 +00:00
Marc Weber
afed669a5a removed debug trace command
svn path=/nixos/trunk/; revision=12055
2008-06-12 12:19:47 +00:00
Marc Weber
216e3b73f4 added support for unixODBC in configuration.nix writing /etc/odbcinst.ini
svn path=/nixos/trunk/; revision=12045
2008-06-11 23:06:53 +00:00
Eelco Dolstra
df241fd6ed * Don't include /var/run/current-system/sw/lib in the LD_LIBRARY_PATH
by default since this can really make the functioning of
  applications unpredictable as they can pick up arbitrary
  library versions from that directory.  LD_LIBRARY_PATH should only
  contain very specific paths (like /var/run/opengl-driver/lib for
  overriding the system OpenGL implementation, or the NSS module
  path).  This is even more important given that the stdenv-updates
  branch uses RUNPATHs instead of RPATHs, so *all* libraries are
  overridable by LD_LIBRARY_PATH.

svn path=/nixos/trunk/; revision=11967
2008-06-04 09:11:47 +00:00
Eelco Dolstra
f2598a9ca5 * In ssmtp, keep the From line if set explicitly in a mail.
svn path=/nixos/trunk/; revision=11706
2008-04-24 12:36:50 +00:00
Eelco Dolstra
036e00a16d * Don't add nssModulePath when it's empty, because then we get
an empty element in the LD_LIBRARY_PATH, which means search
  for libraries in the current directory.

svn path=/nixos/trunk/; revision=11545
2008-04-10 12:14:15 +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