Commit Graph

5091 Commits

Author SHA1 Message Date
Domen Kožar
84926ae0db Merge pull request #270 from aristidb/master
Add simple rsnapshot module
2013-10-06 14:40:23 -07:00
Aristid Breitkreuz
5e07af062d rsnapshot: do not use /etc/rsnapshot.conf 2013-10-06 23:36:07 +02:00
Aristid Breitkreuz
2700a13596 rsnapshot: extraConfiguration -> extraConfig 2013-10-06 23:05:30 +02:00
Aristid Breitkreuz
fa1f5e5b75 implement bjornfors comments 2013-10-06 23:02:41 +02:00
Aristid Breitkreuz
cd98acd3a7 add simple rsnapshot module 2013-10-06 22:23:52 +02:00
Evgeny Egorochkin
56e5b35f2e Properly wipe .compose-cache.
Fixes #267.
2013-10-06 10:53:05 +03:00
Eelco Dolstra
7808044ba7 Remove the nixos.unstable job from the trunk-combined jobset 2013-10-06 00:22:47 +02:00
Domen Kožar
a09ca7c3d3 Merge pull request #209 from MarcWeber/submit/firebird
systemd/firebird
2013-10-05 14:13:50 -07:00
Marc Weber
5dbc5f120c firebird service
many suggestions contributed by bjornfor and edolstra
2013-10-05 23:07:33 +02:00
Rok Garbas
c95d830839 adding http_address option to varnish service 2013-10-04 00:24:59 +02:00
Rok Garbas
7b6e26b380 some more zope2 service improvements 2013-10-04 00:24:18 +02:00
Rok Garbas
4ff36cb137 zope2 service fixes 2013-10-03 20:01:58 +02:00
Domen Kožar
fb34754933 Prettify graphite service
cc @offlinehacker
2013-10-03 16:20:48 +02:00
Rok Garbas
81d28e744c zope2 service (plone) 2013-10-02 15:15:40 +02:00
Eelco Dolstra
17f519e590 Use "cp" instead of "rsync" for VirtualBox image generation
Rsync appears to use a lot of memory.  Fixes #266.
2013-10-02 14:19:26 +02:00
Sander van der Burg
472aff23b7 Move run-in-machine test to a different place, because it does not conform to the other testcases' interface 2013-10-02 13:25:51 +02:00
Eelco Dolstra
c13041c65c Unify the two Memtest modules
This means we now have Memtest86+ on the installation CD.
2013-10-02 12:33:06 +02:00
Sander van der Burg
1c58fbe4a9 Fix run-in-machine testcase + add it to the tests 2013-10-02 12:06:02 +02:00
Sander van der Burg
afdae66335 The testing interface does not take nixpkgs as a parameter anymore => fix this 2013-10-02 11:47:28 +02:00
Eelco Dolstra
c9b4e6fda2 Don't disable D-Bus if environment.noXlibs is set
D-Bus cannot be disabled since systemd/logind depend on it.
2013-10-01 14:45:20 +02:00
Eelco Dolstra
ed5fbf0082 Don't spam the user 2013-10-01 13:53:56 +02:00
Alexei Robyn
869be5611d Added support for -I flag to nixos-install 2013-09-30 13:27:08 +02:00
Peter Simons
c811d79c98 Merge pull request #262 from offlinehacker/fix/stage_2_lib_var_db
stage-2-init: create /var/lib and /var/db at boot, so some modules that create user home folders here don't fail
2013-09-30 01:38:56 -07:00
Shea Levy
6e604c8787 enableSplashScreen is no longer a valid option
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-27 10:50:52 -04:00
Domen Kožar
5384b04ead bash: fix broken completion 2013-09-27 01:15:22 +02:00
Eelco Dolstra
df6f5ade40 cupsd: Use Type=forking
http://hydra.nixos.org/build/6291101
2013-09-26 23:56:38 +02:00
Eelco Dolstra
e1318e6026 cupsd: Log to syslog (and thus the journal) 2013-09-26 21:05:20 +02:00
Eelco Dolstra
a26e4a43f3 Add a test for CUPS 2013-09-26 21:05:20 +02:00
Eelco Dolstra
82e1d0c8b1 Remove services.ttyBackgrounds
This hasn't worked in a long time.
2013-09-26 17:33:52 +02:00
Eelco Dolstra
b7b2476499 Remove the portmap module
It's obsoleted by rpcbind.
2013-09-26 17:04:07 +02:00
Jaka Hudoklin
12dda685ee stage-2-init: create /var/lib and /var/db at boot, so some modules that create user home folders here don't fail 2013-09-26 16:38:12 +02:00
Eelco Dolstra
f70fbb1791 Fix duplicated environment values
All profileVariables listed each profile twice (e.g. $PATH contained
$HOME/.nix-profile/bin twice).  This is because mergeAttrsWithFunc is
broken (and deprecated):

  nix-repl> :p mergeAttrsWithFunc concat { x = [1]; } { y = [2]; }
  { x = [ 1 ]; y = [ 2 2 ]; }

So use zipAttrsWith instead.
2013-09-25 00:48:28 +02:00
Eelco Dolstra
cfd20debfb Fix bashrc regression
Interactive non-login shells should not source /etc/profile, otherwise
environment variables set by the user will get clobbered.  For
example:

  $ export PERL5LIB=/foo
  $ bash
  $ echo $PERL5LIB
  /home/eelco/.nix-profile/lib/perl5/site_perl:/nix/var/nix/profiles/default/lib/perl5/site_perl:/run/current-system/sw/lib/perl5/site_perl:/home/eelco/.nix-profile/lib/perl5/site_perl:/nix/var/nix/profiles/default/lib/perl5/site_perl:/run/current-system/sw/lib/perl5/site_perl
2013-09-25 00:25:22 +02:00
Rickard Nilsson
78721f57eb nvidia-x11: Put nvidia.icd in /etc/OpenCL/vendors
This makes OpenCL work with Nvidia cards (tested with darktable).
2013-09-24 20:28:52 +02:00
Shea Levy
9667a1ef75 environment.promptInit is now programs.<shell>.promptInit
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-24 09:53:47 -04:00
Shea Levy
9ce148e738 Don't break compatibility with pre-1.6 nix
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-24 09:40:06 -04:00
Eelco Dolstra
ec2266b2e2 Make environment variables overridable 2013-09-24 11:27:25 +02:00
Eelco Dolstra
b933b15d72 Don't generate /etc/environment
/etc/environment, if it exists, should be a list of NAME=VALUE pairs,
not a shell script.  See the pam_env manpage.
2013-09-24 11:01:55 +02:00
Rickard Nilsson
3a17c2b30b Add option systemd.automounts, for definining automount units 2013-09-23 23:16:45 +02:00
Eelco Dolstra
9df40867b9 In environment.variables, unify "value" and "list" 2013-09-23 23:07:32 +02:00
Mathijs Kwik
3840e96e79 Merge pull request #256 from oxij/shells-environment
I tested the previous "version" and found my environment to be exactly the same.

Let's start discussing possible extensions/improvements somewhere else. For now it's a nice improvement.
2013-09-23 11:23:10 -07:00
Jan Malakhovski
ffa4b28dce Add support for Zsh as an alternative (or not) default (or not) interactive shell. 2013-09-23 17:06:26 +00:00
Jan Malakhovski
b3f4040512 Radically change the way NixOS handles environment variables and make it possible not to use Bash as the default interactive shell.
This change does two things:

* "NixOSizes" environment variables generation. This allows some more
  error-checking and opens possibilities for a modular environment
  configuration. From now on the most of environment variables are
  generated directly by the nix code. Generating sh code that
  generates environment variables is left in a few places where
  nontrivial access to a local environment state is needed.
* By doing the first change this patch untangles bash from the
  environment configuration and makes it trivial to add a support for
  other non bash-compatible shells.

Now to the sad part. This change is quite large (and I'm not sure it's
possible to split it) and yet is not quite complete, it needs some
changes to nixpkgs to be perfect.
See !!! comments in modules/config/shells-environment.nix.

Main principle behind this change is "change environment generation
and nothing else". In particular, shell configuration principles stay
exactly the same as before.
2013-09-23 16:55:25 +00:00
Rickard Nilsson
bfd86d4e74 Fix bug in NetworkManager name server configuration 2013-09-23 16:01:56 +02:00
Eelco Dolstra
d94aa36f1e Fix saving the ALSA sound card state
This didn't work reliably because it raced with the remounting of /.
So if you were unlucky, then / was read-only by the time we ran
"alsactl store".  Now the sound card state is saved before anything is
unmounted/remounted.
2013-09-22 21:39:05 +02:00
Eelco Dolstra
f19065c283 Fix broken systemd shutdown services
The services systemd-random-seed-save.service and
systemd-update-utmp-shutdown.service from systemd 203 don't work,
because they have a RequiresMountFor dependency on /var/lib and
/var/log.  Such a dependency produces a cycle, causing systemd to drop
those services:

  Fixing conflicting jobs by deleting job poweroff.target/stop
  Deleting job systemd-poweroff.service/stop as dependency of job poweroff.target/stop
  Deleting job umount.target/stop as dependency of job systemd-poweroff.service/stop
  Deleting job -.mount/start as dependency of job umount.target/stop
  Deleting job systemd-random-seed-save.service/start as dependency of job -.mount/start
  Deleting job systemd-update-utmp-shutdown.service/start as dependency of job -.mount/start

Dropping the RequiresMountFor doesn't work either, because then
/var/... may have meen unmounted or remounted read-only.

Upstream systemd fixes this by doing the actual work from an ExecStop
action in an already-running service than conflicts with
shutdown.target.  So I backported that here.  The main consequence is
that wtmp shutdown records now get written properly.

The main lesson: shutdown.target is useless for pulling in services
during shutdown if they need to write anywhere.
2013-09-22 21:39:05 +02:00
Eelco Dolstra
f5c4874b05 Fix service description 2013-09-22 21:39:05 +02:00
Eelco Dolstra
4be5fae2da Log console logins in /var/log/wtmp 2013-09-22 21:39:05 +02:00
Eelco Dolstra
14f55a2f67 Remove unused runlevel targets 2013-09-22 21:39:05 +02:00
Eelco Dolstra
50d942960e Write a reboot record to /var/log/wtmp 2013-09-22 21:39:05 +02:00