Commit graph

2809 commits

Author SHA1 Message Date
Phreedom
fc06f1ec60 Merge pull request #145 from maggesi/xen-updates
Remove obsolete option in Xen domU module
2013-05-05 09:38:19 -07:00
Phreedom
6c988a593a Merge pull request #136 from MarcWeber/submit/grubDevice
s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings
2013-05-05 07:41:22 -07:00
Evgeny Egorochkin
d6df27277b ZFS: automatically import zpools and mount zfs filesystems.
Patch contributed by Jack Cummings.
2013-05-05 16:36:08 +03:00
Shea Levy
17f10f70ad Include xhci_hcd in the initrd for usb3 devices
Fixes #158, I don't think there is an `xhci' module

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 11:35:01 -04:00
Shea Levy
faa064dbc7 32-bit gummiboot uses lower-case ia32
Thanks to iElectric in the channel for pointing it out

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-04 11:26:56 -04:00
Phreedom
7190c867d6 Merge pull request #156 from modulistic/master
typo in networking.dnsSingleRequest documentation
2013-05-04 02:34:28 -07:00
modulistic
bdb22d37f1 typo in networking.dnsSingleRequest documentation 2013-05-04 11:26:56 +02:00
Evgeny Egorochkin
4b69de4a3d VirtualBox: udev rule to populate /dev/vboxusb.
After Linux 3.2(?), /proc/bus/usb (and usbfs (or usbdevfs?)) went away,
leaving virtualbox no way to determine what USB devices were connected
to the system. The solution was to add some virtualbox specific udev
rules to populate /dev/vboxusb with what was in /proc/bus/usb before.

Patch contributed by Jack Cummings.
2013-05-04 12:20:46 +03:00
Domen Kožar
01887f2c86 Merge pull request #100 from jcumming/hostapd.130224
proper hostapd dependencies
2013-05-04 01:38:45 -07:00
Rok Garbas
f5e720aba8 adding sensor option to thinkfan 2013-05-03 03:28:04 +02:00
Shea Levy
2415787040 gummiboot: Fix bug where old conf scripts for single-digit generations weren't removed
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-30 13:03:14 -04:00
Shea Levy
9bc021ceda Set the firmware_class path in modprobe.d
Activation scripts are run before systemd is started, so unless users
are loading firmware in the initrd (which AFAICT we currently have no
support for) the previous /sys-based setting of firmware_class was
ineffective on boot.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-30 11:46:34 -04:00
Peter Simons
ebb9f0e3fc atd: add "batch" to the list of programs that need a setuid wrapper 2013-04-27 22:42:19 +02:00
Lluís Batlle i Rossell
4637f6d878 Removing unneded imports for the display-manager.
Discussed in
2e088aa277 (commitcomment-3074283)
2013-04-28 00:19:04 +04:00
Domen Kožar
f34d79c351 Merge pull request #150 from bjornfor/nixos-install-fix-errormsg
nixos-install: fix error message consistency
2013-04-27 09:14:50 -07:00
Domen Kožar
c4ead79dd6 Merge pull request #149 from NixOS/networkmanager_suspend
restart networkmanager on suspend resume
2013-04-27 09:13:15 -07:00
Lluís Batlle i Rossell
af0e751ee9 Making gnunet start properly (calling gnunet-service-arm directly) 2013-04-24 20:17:14 +04:00
Lluís Batlle i Rossell
f50014339a Putting the gnunet module up to date. It still doesn't start gnunet though.
No idea why.
2013-04-24 19:03:29 +04:00
Bjørn Forsman
ec13407807 nixos-install: fix error message consistency
The test is for path A but the error message says path B. Fix it.
2013-04-22 22:06:27 +02:00
Lluís Batlle i Rossell
b4af56d376 lightdm: improving a bit the indentation. 2013-04-22 23:32:11 +04:00
Oliver Charles
2e088aa277 lightdm: Initial expression for lightdm as the display-manager service (using default GTK greeter) 2013-04-22 23:32:10 +04:00
Domen Kozar
ec9dc730ec restart networkmanager on suspend resume 2013-04-22 19:36:14 +02:00
Eelco Dolstra
447691836a Create a /etc/zoneinfo symlink and use it in $TZDIR
Setting $TZDIR to ${pkgs.tzdata}/share/zoneinfo can cause logged-in
sessions to refer to a garbage-collected zoneinfo directory.  So use
/etc/zoneinfo instead.
2013-04-22 19:08:16 +02:00
Eelco Dolstra
945849b86f Don't set $TZ
We don't need to set $TZ, because we have /etc/localtime.  In fact,
setting $TZ without $TZDIR doesn't work anymore since Glibc no longer
contains zone info.
2013-04-22 18:56:19 +02:00
Evgeny Egorochkin
fa0f5bf72f Freenet: fix 2 typos 2013-04-22 16:50:58 +03:00
Mathijs Kwik
ae2f280b67 cron: set TZDIR so cron is able to find the TZ 2013-04-22 14:24:15 +02:00
Mathijs Kwik
006f328877 virtual network interfaces: make systemd aware of the relation between device and service
If I want to bring down tap0.service (or systemd wants to do this
during a configuration-change which changes the path to tunctl),
openvpn (or other services using tap0) need to be brought down as
well, otherwise tunctl -d is not able to remove the tap0 device,
leaving it in a failed (but "up") state.
2013-04-22 14:24:15 +02:00
Mathijs Kwik
8de00c328a systemd: add "requiredBy" option.
"require" is a stronger version of "want",
and just like wantedBy allows you to specify this relation in reverse,
requiredBy does the same.

It may seem pointless to be able to specify these stronger relations in
reverse, because if something is really required, you would expect the
other unit to specify this himself.

However, this is still useful for virtual/automatic units (like
devices) that are created by systemd on demand and hence have no unit
file you can alter.
2013-04-22 14:24:15 +02:00
Jaka Hudoklin
b230153cfd Merge branch 'master' of https://github.com/NixOS/nixos into nameservers
Conflicts:
	modules/tasks/network-interfaces.nix
2013-04-21 20:02:26 +02:00
Jaka Hudoklin
7427639b84 Static nameservers have precedence 2013-04-21 19:48:15 +02:00
Lluís Batlle i Rossell
7a71320a9c Adding freenet module 2013-04-21 11:27:41 +04:00
Vladimír Čunát
41ccade531 Merge pull request #132 from ierton/udisks2-v2
add udisks2 for Xfce
2013-04-20 01:36:14 -07:00
Shea Levy
e32774c270 rabbitmq.nix: Set SYS_PREFIX empty so files live in /var
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-19 10:49:46 -04:00
viric
204f5a3f4c Merge pull request #143 from viric/grub_all
Making grub display 'All configurations', not 'Old'
2013-04-17 08:05:09 -07:00
Lluís Batlle i Rossell
1caa1b96cb network-interfaces: fixing a cat/EOF piping confusion 2013-04-17 09:10:41 +02:00
Lluís Batlle i Rossell
927a3e3ff2 fcron: fixing the startOn, since upstart times. 2013-04-17 00:21:19 +02:00
Marco Maggesi
04415eb582 Remove obsolete option in Xen domU module 2013-04-16 19:46:22 +02:00
Shea Levy
cc1ae918bd Fix cut-off comment in generated configuration.nix
Pointed out by Mathnerd626 on irc

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-16 13:34:37 -04:00
Lluís Batlle i Rossell
3be4fd3f38 Making grub display 'All configurations', not 'Old'
That confused some people, as the first generation shown is
the 'current'.
2013-04-16 11:09:25 +02:00
viric
7d2ec75ae7 Merge pull request #128 from pSub/bitlbee
Bitlbee: updated for systemd; added more options like AuthMode
2013-04-14 12:49:18 -07:00
orbitz
388d83c586 Set required nginx options and sane default 2013-04-14 11:17:16 +02:00
orbitz
8e7bb847c6 Cleanup whitespaces 2013-04-14 11:14:27 +02:00
Jack Cummings
edc12de8c9 add wantedBy network.target so that hostapd starts by default 2013-04-12 23:25:32 -07:00
Shea Levy
ce8c145a98 nixos-install: Include nix's perl libs in perl's INC
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 16:18:24 -04:00
Shea Levy
6e0723bac6 nixos-install: Mound nixos and nixpkgs src directly
Previously nixos-install would fail if nixos and nixpkgs weren't on the same mountpoint as /

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-11 16:12:43 -04:00
Eelco Dolstra
e28b0453bf MediaWiki: Update to 1.20.3 2013-04-11 17:29:34 +02:00
Eelco Dolstra
56e678725d Remove Upstart reference 2013-04-11 17:29:34 +02:00
Peter Simons
e627d309fd bash-completion: support the "$out/share/bash-completion" location used by modern packages 2013-04-11 00:48:58 +02:00
Marc Weber
9bf073b58b s/boot.grubDevice/boot.loader.grub.device/ to shut down warnings 2013-04-10 23:54:37 +02:00
Shea Levy
a215600335 nixos-install: Unmount efivars if mounted
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-10 15:08:33 -04:00
Shea Levy
6a1e1fa108 nixos-install: Bind-mount efivars if it exists
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-10 09:15:54 -04:00
Rickard Nilsson
bf2707d359 unionfs-fuse: Fix conditional expressions 2013-04-10 14:06:29 +02:00
Rickard Nilsson
c59761e994 openldap: Adjust to systemd 2013-04-09 22:48:13 +02:00
Rickard Nilsson
0ccc107300 nslcd: Start after network.target (but don't require network) 2013-04-09 22:47:59 +02:00
Rickard Nilsson
b2b221d533 Add unionfs-fuse to system.fsPackages if needed 2013-04-09 16:44:14 +02:00
Eelco Dolstra
86f11dadaa switch-to-configuration: Use full path to sync 2013-04-08 17:34:14 +02:00
Domen Kozar
8d5c252ae1 add thinkfan service 2013-04-06 23:35:04 +02:00
Florian Friesdorf
92ad293d02 iso_minimal_new_kernel 2013-04-06 18:24:50 +02:00
Shea Levy
52fc087296 Revert "postgresql: version the dataDir by default"
This reverts commit 7f1e728606.

This would have been nice if we had had it from the start, but now it
just breaks things for existing users. Maybe we can add it conditionally
when new postgres versions come out.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 09:20:50 -04:00
Shea Levy
56a60c7fe6 Revert "Fix nixos evaluation on systems that haven't set postgresql.package"
This reverts commit 1e543984bc.

This would have been nice if we had had it from the start, but now it
just breaks things for existing users. Maybe we can add it conditionally
when new postgres versions come out.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 09:19:23 -04:00
Shea Levy
1e543984bc Fix nixos evaluation on systems that haven't set postgresql.package
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 08:01:06 -04:00
Shea Levy
7f1e728606 postgresql: version the dataDir by default
Among other things, this will make migrating between versions easier

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-05 07:55:02 -04:00
Mathijs Kwik
58240e2304 add e17 desktop manager
desktop-manager is a bit misleading in this case as there is no
session yet and most apps are still missing. This can eventually
grow further once more e17 apps get packaged for nix.

However, for now, I need to initialize some e17 dbus services to
have the "terminology" terminal emulator provide gfx previews.
2013-04-04 22:19:22 +02:00
Mathijs Kwik
57dc4b9188 xsession: add config option to let systemd handle lid/power events 2013-04-04 22:19:22 +02:00
Mathijs Kwik
fd6b48783d remove redundant if 2013-04-04 22:19:22 +02:00
Mathijs Kwik
3c8d95f726 xsession: remove duplicate sourcing of /etc/profile 2013-04-04 22:19:22 +02:00
Eelco Dolstra
a446fa9099 PostgreSQL: Don't specify a default PostgreSQL package
The user should specify which major version to use
(e.g. "services.postgresql.package = pkgs.postgresql92").  We can't
really provide a sensible default, because such a default would have
to be updated from time to time, and there is no automated upgrade
procedure.  So leave upgrading to the user.
2013-04-04 18:21:51 +02:00
Sergey Mironov
303794e0d7 Xfce: use udisks2 instead of udisks
Enabling udisks2 allows gvfs (which should be built with udisks support) to
perform mount/unmount operations on removable drives. It affects Thunar and
probably other Gtk-based file managers.

Gvfs doesn't supports earlier versions of udisks.
2013-04-04 12:09:26 +04:00
Sergey Mironov
4b504d8bba udisks2: add udisks2 service
Udisks2 is a Dbus service started by systemd on demand.
2013-04-04 12:06:34 +04:00
Rickard Nilsson
3d93fb9243 xbmc: Use /var/run/lirc/lircd as lirc socket
The latest version of the lirc daemon uses /var/run/lirc/lircd, not
/dev/lircd that xbmc uses as default.
2013-04-03 23:16:27 +02:00
Shea Levy
1def5bad35 Revert "Use the new net.ifnames kernel command line flag to disable persistent interface names"
As @edolstra pointed out, this behavior is not equivalent to what we had
before as the kernel command line parameter won't take effect until the
next boot. Probably it's not likely that someone will make this change
and then add a network card before rebooting, but might as well support
that since we can.

This reverts commit f7563698df.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-03 07:37:04 -04:00
Eelco Dolstra
ee29054da1 Create an empty /etc/resolv.conf to shut up nscd 2013-04-03 13:27:41 +02:00
Eelco Dolstra
fef5a18587 Enable sudoedit 2013-04-03 13:27:41 +02:00
Peter Simons
0139f015be modules/config/networking.nix: strip trailing whitespace 2013-04-03 12:48:36 +02:00
Peter Simons
e2eaae1155 Let resolvconf 'restart' the nscd service instead of 'reload'ing it.
Sometimes nscd starts up before a /etc/resolv.conf file has been written, and
apparently triggering a cache flush (reload) is not good enough to make it
recover from that problem. To remedy the issue, we restart the service instead.
See <https://github.com/NixOS/nixos/issues/34> for further details.
2013-04-03 12:48:25 +02:00
Pascal Wittmann
c4b3b71917 Bitlbee: create homedir; do not use /etc/bitlbee.conf 2013-04-02 00:08:17 +02:00
Shea Levy
cf3ef6a1fc Merge branch 'lighttpd' of git://github.com/bjornfor/nixos into upstream-master
Moves config file into the store rather than polluting etc, which has a
number of benefits

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-01 13:09:23 -04:00
Shea Levy
f7563698df Use the new net.ifnames kernel command line flag to disable persistent interface names
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-01 07:03:00 -04:00
Shea Levy
863c6f2490 Fix missed kernel->kernelDev change
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-04-01 06:08:30 -04:00
Domen Kozar
969c577173 fixes #127 2013-03-31 21:18:57 +02:00
Bjørn Forsman
395bc5d05c lighttpd: restart service if config changes
Using /etc/lighttpd.conf "hides" the config file from NixOS so that it
will not automatically restart the service when its config file changes.
So don't do that.
2013-03-31 18:06:43 +02:00
Eelco Dolstra
f40a38b2c8 Remove /etc lock files at boot time 2013-03-31 15:40:13 +02:00
Lluís Batlle i Rossell
86c1e10a43 Setting pam otpw *after* pam_unix, for dovecot failed auth messages.
I think it's nice that it first asks the usual password, and then offers the
otpw one if enabled. That enables dovecot to show the last pam prompt.

I also add the dovecot option for that.
2013-03-30 22:25:19 +01:00
Lluís Batlle i Rossell
c53bd1b279 pam: adding otpw optional, default false 2013-03-30 21:06:23 +01:00
Pascal Wittmann
8d0a7cb6d2 Bitlbee: tabs to spaces 2013-03-29 12:51:47 +01:00
Pascal Wittmann
e33af28567 Bitlbee: hardcode username and configdir; homedir == configdir 2013-03-29 12:37:06 +01:00
Pascal Wittmann
4af26d582c Bitlbee: updated for systemd; added more options like AuthMode 2013-03-29 10:28:54 +01:00
Eelco Dolstra
fbde5e027e Sync after installing the boot loader
Previously we synced just before calling switch-to-configuration.
That prevents corruption of the Nix store, but it can leave the boot
loader configuration and kernel files in /boot corrupted.  So do the
sync after installing the boot loader.
2013-03-28 16:11:54 +01:00
Eelco Dolstra
9000fd81d5 Hack: force timers.target to be started
Usually timers.target is pulled in by basic.target, but we don't
restart basic.target.  So timers.target wouldn't be started when
coming from an older systemd.
2013-03-28 15:02:11 +01:00
Eelco Dolstra
c2977f134e nix-gc.timer: Fix the start time 2013-03-28 13:35:07 +01:00
Eelco Dolstra
7ad91f31d6 Add support for systemd timers 2013-03-28 11:54:19 +01:00
Eelco Dolstra
9c3a31ff4c Clear /proc/sys/kernel/hotplug again
Otherwise the kernel will pointlessly try to invoke /sbin/hotplug all
the time.  Another feature lost in the systemd switch.
2013-03-27 23:03:37 +01:00
Eelco Dolstra
c039e286b9 Set the kernel.poweroff_cmd sysctl
This allows Xen (and EC2) to power off an instance properly.  We had
this before (see aeb89fc753), but it got
lost in the systemd migration.
2013-03-27 23:03:37 +01:00
Eelco Dolstra
f3bea050f8 Updates for systemd 198/199 2013-03-27 23:03:37 +01:00
Eelco Dolstra
8b9216fdcb Don't set the firmware path in 3 different places 2013-03-27 23:03:37 +01:00
Domen Kozar
c52cb9bb65 add almir service 2013-03-27 11:47:28 +01:00
Shea Levy
6c6b0be503 iso_efi: Fix build
Thanks to mwc in irc for pointing it out

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 14:36:53 -04:00
Shea Levy
652e2ab610 "Maintain" the tested job so I get notifications when it fails
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 12:35:28 -04:00
Shea Levy
89dd7b0f69 Revert "Don't mount /nix/store ro if it's a mountpoint"
Now that nixUnstable supports remounting in the "/nix/store is a
mountpoint" case, this is no longer necessary.

This reverts commit f1d48aec43.

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-26 12:20:06 -04:00
Eelco Dolstra
991a78dd8b Use nixUnstable 2013-03-26 15:58:38 +01:00