Commit graph

1400 commits

Author SHA1 Message Date
William A. Kennington III 2b703f82d5 tests/installer: Test for more grub configurations 2014-08-28 13:35:35 -07:00
William A. Kennington III 809caa87ab tests/installer: Add btrfs tests for grub and nixos-generate-config 2014-08-28 13:35:35 -07:00
William A. Kennington III 8329d12b79 grub: Change fsIdentifier to str from string 2014-08-28 13:35:35 -07:00
William A. Kennington III 5870ae613f nixos/release: Dynamically generate installer tests 2014-08-28 13:35:35 -07:00
William A. Kennington III 769d2dc6bf nixos/grub: Catch errors from command execution 2014-08-28 13:35:35 -07:00
William A. Kennington III d4e2040099 nixos/grub: Refactor install-grub.pl and correct perl syntax 2014-08-28 13:35:35 -07:00
William A. Kennington III 99b4792554 nixos/grub: Refactor perl script to remove the Switch module 2014-08-28 13:35:35 -07:00
William A. Kennington III 525acb4d4f nixos/grub: Fix typo 2014-08-28 13:35:35 -07:00
William A. Kennington III 70c11772a6 nixos/grub: Fix some silly perl struct accesses 2014-08-28 13:35:35 -07:00
William A. Kennington III a6e6c85f06 grub: Add support for detecting btrfs subvolumes 2014-08-28 13:35:35 -07:00
William A. Kennington III fba9f641a8 grub: Add support for forcing devices to be identified with labels or UUIDs 2014-08-28 13:35:35 -07:00
William A. Kennington III c5bdb469ce Update the grub configuration script to handle more complex filesystem layouts including full zfs / and /boot 2014-08-28 13:35:35 -07:00
William A. Kennington III 02ab48d0ee Enable grub zfsSupport if zfs is built into the initrd 2014-08-28 13:35:34 -07:00
William A. Kennington III 3c6e2fbba9 Add optional zfsSupport to the nixos grub configuration 2014-08-28 13:35:34 -07:00
William A. Kennington III 4f832b5217 Revert "grub: Allow setting the boot root explicitly"
This reverts commit e4630c1d41.
2014-08-28 13:35:34 -07:00
Paul Colomiets adbb9ff796 dnsmasq: upgrade to 2.71, fixed dnsmasq module
* The module now has systemd config

* Add resolveLocalQueries option which sets up it as a dns server for
  local host (including reasonable setup of resolvconf)

* Add "dnsmasq" user for running daemon

* Enabled dbus and dnssec support for the package

Conflicts:
	nixos/modules/misc/ids.nix
2014-08-28 11:39:03 -07:00
Eelco Dolstra 21ab4e054c nixos-container run: Execute command using ‘su’
This ensures that the environment is set up correctly.
2014-08-28 02:20:31 +02:00
Eelco Dolstra 6773babd5b Containers: Use nsenter to execute commands in containers
Also remove ‘nixos-container set-root-password’, which is kind of
pointless now.
2014-08-28 02:20:23 +02:00
aszlig 8a56a55bb4
nixos/manual: Use literalExample when feasible.
Should bring most of the examples into a better consistency regarding
syntactic representation in the manual.

Thanks to @devhell for reporting.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-27 23:41:15 +02:00
aszlig 9667a4067c
nixos: Use literalExample for systemPackages.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-27 22:44:56 +02:00
Emery Hemingway e7597b12b8 privoxy: upstart to systemd conversion, actions file editing
fix missing actions and filters
2014-08-27 11:34:10 -04:00
Jaka Hudoklin fd52ebd160 Merge pull request #3558 from geerds/trackpoint
Add "emulateWheel" option for trackpoint configuration
2014-08-27 13:50:26 +02:00
Nathan Bijnens ac90177cb1 Zookeeper 2014-08-27 13:01:30 +02:00
Eelco Dolstra 41788255ab Manual: Start of module-specific documentation 2014-08-27 12:24:44 +02:00
Eelco Dolstra 005f78e739 Fix opening NixOS manual
http://hydra.nixos.org/build/13760576
2014-08-27 11:08:50 +02:00
Shea Levy 4061c18c98 Revert "grub: removed orphaned mkOption configurationName"
The configurationName option value is still used by NixOS, this removal
breaks grub users.

This reverts commit bd811d32b4.
2014-08-27 03:26:40 -04:00
Eelco Dolstra f6b4214567 /dev/sda1 -> "/dev/sda1"
Otherwise Nix might try to copy /dev/sda1 under certain circumstances
:-)
2014-08-26 19:30:45 +02:00
Joachim Schiele bd811d32b4 grub: removed orphaned mkOption configurationName 2014-08-26 19:14:47 +02:00
Eelco Dolstra 60e6cc81b5 No caps in filenames 2014-08-26 19:04:02 +02:00
Mikey Ariel a099ca4505 Chunk NixOS manual
[Squashed commits to make git blame etc. more likely to work. -ED]
2014-08-26 19:03:49 +02:00
Eelco Dolstra c72fdf4f48 Manual: Tweak 2014-08-26 15:13:21 +02:00
Eelco Dolstra 81f2749012 Manual: Chunk into separate pages 2014-08-25 19:08:31 +02:00
Rickard Nilsson 8c78986553 Some pkgs.lib -> lib fixes 2014-08-25 14:40:40 +02:00
Eelco Dolstra d2539605e1 Remove reference to icecat 2014-08-25 14:35:08 +02:00
Eelco Dolstra b1ce3cc172 Manual: Handle XML files in subdirectories 2014-08-25 14:33:33 +02:00
Rickard Nilsson 684e8b241e Merge pull request #3780 from ip1981/master
Fixed rewrite rules for Mediawiki
2014-08-25 12:46:08 +02:00
Igor Pashev cdd1785cd6 Fixed rewrite rules for Mediawiki
If Mediawiki was served from the root directory of the server
it was impossible to serve other directories.

Make sure that URLs defined in servedDirs are not rewritten.
Use case: serving local copy of MathJax
2014-08-25 11:55:57 +02:00
Eelco Dolstra 619f18956d Bump the amount of memory for the installer test
It randomly OOMs.

http://hydra.nixos.org/build/13587153
2014-08-25 10:54:10 +02:00
Nicolas Pierron 873ab39401 NixOS: Add meta.maintainer option to modules. 2014-08-25 01:04:39 +02:00
aszlig 4a4c051a95
nixos: Remove modprobe.d/nixos.conf from initrd.
For example in VM tests, this causes firmware to be included in the
initrd. So until we have a better fix for adding early-stage module
options, I'll remove this.

Fixes a regression introduced by 0aa2c1d and closes #3764.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-24 18:19:56 +02:00
Jaka Kranjc 1d67ea1ce3 nixos-install.sh: added --root parameter
Previously:
- setting the mountpoint was only possible through an environment variable
- a discrepancy from nixos-generate-config, which has --root
2014-08-24 17:40:20 +02:00
Eelco Dolstra f002a27a80 Remove obsolete directory 2014-08-24 16:35:28 +02:00
Bjørn Forsman 6949e24366 nixos: add fail2ban to module-list.nix
Now that the fail2ban service has the ".enable" option, I think it's
time to add it to the module list, so that we can enable it in
configuration.nix like this:

  services.fail2ban.enable = true;
2014-08-24 13:50:57 +02:00
William A. Kennington III aa77fe0fb0 nixos/radvd: Convert to a systemd unit
Additionally, remove the automatic initialization of the ipv6 forwarding
sysctl as this should be handled by the end user. This really should not
be an issue as most people running radvd are likely forwarding ipv6
packets.
2014-08-24 03:12:55 -07:00
Rickard Nilsson b1d225b645 Add NixOS module for the Riemann dashboard server 2014-08-23 17:40:22 +02:00
Rickard Nilsson e9252cb35e Add NixOS module for Riemann monitoring server. 2014-08-23 17:40:22 +02:00
Michael Raskin 9b13792075 Merge pull request #3656 from AndersonTorres/fluxbox
Fluxbox: new package (1.3.5)
2014-08-23 13:07:46 +04:00
Jaka Hudoklin 84ea03fa3f nixos: add neo4j database module 2014-08-23 13:11:09 +04:00
Michael Raskin dec865c88c Merge pull request #3583 from ts468/thermald
Add thermald: Linux Thermal Daemon
2014-08-23 12:49:59 +04:00
Michael Raskin 0d95c5c647 Merge pull request #3553 from vcunat/p/keyboards
initrd.availableKernelModules: add support for keyboards
2014-08-23 12:49:04 +04:00
Michael Raskin 327074682f Merge pull request #3522 from ryantm/patch-1
add note about mutableUsers to user management section
2014-08-23 12:47:42 +04:00
Michael Raskin 4a56121d8e Merge pull request #3505 from Shados/fix-initrd-modprobe
initrd: Fixed to include/use modprobe config files
2014-08-23 12:46:28 +04:00
Edward Tjörnhammar 1615be91ef Add mlmmj package and nixos module. 2014-08-23 12:30:45 +04:00
Michael Raskin c0da615c02 Merge pull request #3230 from robberer/module/httpd
httpd: disable logging when logFormat = "none"
2014-08-23 11:37:48 +04:00
Michael Raskin 38d9a1cf0e Merge pull request #3240 from ehmry/siproxd
siproxd: initial service expression
2014-08-23 11:30:18 +04:00
Michael Raskin 0505eabc6d Merge pull request #3087 from wkennington/master.sit
nixos/network-interfaces: Add sit interfaces
2014-08-23 11:15:41 +04:00
Eelco Dolstra 7cdb1bb8aa Build a few NixOS system closures on Hydra
This will allow us to keep track of the evolution of closure sizes of
some typical configurations. (Hydra stores closure sizes in its
database.)
2014-08-22 11:41:15 +02:00
AndersonTorres 49fcac0d6b Fluxbox: adding system support (as a module) 2014-08-21 07:03:37 -03:00
Matej Cotman f4b5cd9f3f use mkDefault on root's shell 2014-08-20 21:17:48 +02:00
Eelco Dolstra b18f503f1a nixos-container: Add command show-host-key
This is used by nixops.
2014-08-19 18:24:48 +02:00
Eelco Dolstra ddd8f0cf66 nixos-container --create: Add option --system-path
This allows creating a container from an existing system store path,
which is especially nice for NixOps-deployed hosts because they don't
need a Nixpkgs tree anymore.
2014-08-19 18:24:44 +02:00
Emery Hemingway af09d3ebd8 siproxd: initial service expression 2014-08-19 10:19:52 -04:00
Eelco Dolstra 23db49cf98 Containers: Fix all-containers.service start
Fixes #3662.
2014-08-19 10:06:48 +02:00
Eelco Dolstra 2c899859bf Containers: Use systemd startup notification
Systemd in a container will call sd_notify when it has finished
booting, so we can use that to signal that the container is
ready. This does require some fiddling with $NOTIFY_SOCKET.
2014-08-18 17:16:13 +02:00
Eelco Dolstra 11d99048c1 Containers: Use systemd-nspawn startup notification 2014-08-18 17:14:55 +02:00
Eelco Dolstra ceb67cc9ef Containers: Clean up veth interfaces 2014-08-18 17:14:49 +02:00
Eelco Dolstra a7a08188bf Containers: Don't remount / 2014-08-18 17:14:43 +02:00
Eelco Dolstra 32b977d4a7 Containers: Fix reboot and poweroff
Previously "machinectl reboot/poweroff" brutally killed the container,
as did "systemctl stop/restart". And reboot didn't actually work. Now
everything is fine.
2014-08-18 17:14:38 +02:00
Eelco Dolstra b10a3e9145 nixos-container: Allow auto-starting containers 2014-08-18 17:11:07 +02:00
Eelco Dolstra 2337a85fc3 Autostart containers at boot time 2014-08-18 17:09:42 +02:00
Eelco Dolstra e7860f04c2 nixos-container: Add status command 2014-08-18 17:09:35 +02:00
Eelco Dolstra 7c4591d010 Don't barf if /var/log doesn't support ACLs
http://hydra.nixos.org/build/13462892
2014-08-18 14:21:45 +02:00
Domen Kožar 1d996821fb Merge pull request #3637 from nathanielbaxter/dev/nixos_manual
nixos manual: Fix instruction for getting booted kernel confix
2014-08-17 16:24:29 +02:00
Nathaniel Baxter 7d4cd20ea4 nixos manual: Fix instruction for getting booted kernel confix 2014-08-17 16:10:10 +10:00
aszlig 6ebe4a6a52
nixos-install: Fix copying symlink resolv.conf.
On some non-NixOS systems (for example those using "resolvconf"),
/etc/resolv.conf is a symlink. So let's dereference when copying hasts
and resolv.conf.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-17 06:46:41 +02:00
Eelco Dolstra e620be97fe Containers: Set up /etc/resolv.conf
Systemd-nspawn is supposed to do this, but doesn't if any of the
--network-* flags are used.
2014-08-15 04:06:01 +02:00
Eelco Dolstra e6c00e60c3 nixos-container destroy: Make idempotent 2014-08-15 04:06:01 +02:00
Eelco Dolstra 785ed2b528 Don't silently ignore errors from the activation script 2014-08-15 02:14:34 +02:00
Eelco Dolstra 883fa4f920 nixos-container destroy: Remove gcroots 2014-08-15 02:14:27 +02:00
Vladimír Čunát 56d9b2cc8a merge #3428: nano: bump and add system-wide config 2014-08-14 23:51:29 +02:00
Luca Bruno 3d0dc6a143 gnome3: add services.xserver.desktopManager.gnome3.sessionPath
Used to add GI_TYPELIB_PATH and LD_LIBRARY_PATH for gnome shell extensions
or other libraries and services.

Not a great solution but may be the start for further work. Let's make
some cool packages work for now.
2014-08-14 21:16:40 +02:00
William A. Kennington III bc6979f7e1 nixos/dhcpcd: Don't configure sit devices 2014-08-14 14:06:56 -05:00
William A. Kennington III 40d88e9f80 nixos/network-interfaces: Add sit interfaces
Previously, we had no method for creating 6-to-4 tunneled interfaces.
This patch adds the option networking.sits, which allows the user to
create named 6-to-4 sit devices.
2014-08-14 14:06:56 -05:00
William A. Kennington III a269acf480 nixos/dhcpcd: Use null instead of empty list to disable allowInterfaces 2014-08-14 14:05:55 -05:00
William A. Kennington III 320a82dd7f nixos/dhcpcd: Add an explicit interfaces option 2014-08-14 14:05:55 -05:00
Thomas Strobel 1da35629cc Cleanup: remove newlines. 2014-08-14 12:42:16 +02:00
Thomas Strobel b63b8260b5 Add thermald: Linux Thermal Daemon 2014-08-14 02:21:31 +02:00
William A. Kennington III d0c0c2f9ba nixos/dhcpd: Wait until network interfaces are configured to start 2014-08-13 15:08:43 -05:00
William A. Kennington III b3ddcfabd9 nixos/dhcpd: Convert to systemd from upstart 2014-08-13 15:08:43 -05:00
William A. Kennington III 24368beed8 nixos/dhcpd: Use dhcp user instead of nobody 2014-08-13 15:08:43 -05:00
William A. Kennington III 4fbf120e84 nixos/dhcpd: Add the ability to drop privileges 2014-08-13 15:08:08 -05:00
William A. Kennington III 56228e5614 nixos/dhcp: Modernize ddns-update-style 2014-08-13 15:08:08 -05:00
Jascha Geerds 6aa3888d97 trackpoint: Add emulateWheel option 2014-08-13 12:11:20 +02:00
Harald van Dijk 67a5ec4efb nixos/lighttpd: fix modules for gitweb
Setting "services.lighttpd.gitweb.enable" to true doesn't enable the
required lighttpd modules to actually make it work. The problem is that
"or" and "||" don't mean the same thing: "or" falls back to the second
operand if the first is not defined, whereas "||" is the normal logical
operator. When cfg.cgit.enable is defined, as false, the expressions
don't have the desired effect.

[Bjørn: modify commit message]
2014-08-12 21:16:01 +02:00
Vladimír Čunát 02cb604fd6 initrd.availableKernelModules: add support for keyboards
As explained in #2169, some keyboards need special drivers,
so these are always added, both on installation and normal systems.
2014-08-12 20:00:01 +02:00
Vladimír Čunát 87c3c0e885 Merge master into #2129
Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix
2014-08-12 19:24:08 +02:00
Matt Miemiec 8695c58648 Add the bspwm window manager to Nix. 2014-08-12 18:22:15 +02:00
Luca Bruno 14895d6c95 Merge branch 'gdm' 2014-08-12 14:57:38 +02:00
Domen Kožar cc8e4f6814 provide pulseaudioFull and set it as default to hardware.pulseaudio.package 2014-08-12 12:51:25 +02:00
Luca Bruno 1a29fcae69 gdm: Add very experimental display manager 2014-08-12 11:23:42 +02:00