Eelco Dolstra
6b2a14d698
Fix NixOS evaluation
2012-08-09 10:04:25 -04:00
Eelco Dolstra
5ae6385175
qemu-vm.nix: Use ext4 instead of ext3
2012-08-09 10:00:49 -04:00
Shea Levy
da787e3071
efi-boot-stub: List required kernel config
2012-08-08 23:02:46 -04:00
Eelco Dolstra
21da462ad5
Merge pull request #25 from shlevy/required-kernel-config
...
Required kernel config
2012-08-08 10:33:41 -07:00
Shea Levy
c39f493ebb
Minor reorganization
2012-08-07 18:09:08 -04:00
Shea Levy
d9c03b6447
The kernel needs swap support if swapDevices are enabled
2012-08-07 17:34:10 -04:00
Shea Levy
d28876ea70
qemu tests use the virtio console to run commands
2012-08-07 17:04:00 -04:00
Shea Levy
9d8ddd90f9
qemu mounts /nix/store via CIFS
2012-08-07 16:44:15 -04:00
Shea Levy
13d8856a4f
qemu requires VIRTIO_NET (and dependencies) for virtio networking
2012-08-07 16:25:11 -04:00
Eelco Dolstra
66ff6a382a
stage-1-init: Close temporary file descriptor
...
Otherwise this fd will be inherited all the way into the Upstart jobs.
2012-08-07 10:05:33 -04:00
Shea Levy
805d37db48
qemu-vm creates an ext3 filesystem
2012-08-07 07:02:08 -04:00
Shea Levy
0ea2643c63
The initrd mounts some tmpfses
2012-08-07 06:57:01 -04:00
Shea Levy
11e5207a2d
qemu requires VIRTIO_BLK (and dependencies) for virtio drives
2012-08-06 17:10:54 -04:00
Shea Levy
64d0069be3
udev requires unix sockets and inotify
2012-08-06 17:02:35 -04:00
Rickard Nilsson
e33dfa936f
Use busybox mount instead of klibc nfsmount for nfs mounts in initrd.
2012-08-06 16:25:22 -04:00
Shea Levy
e66bcbd58a
The kernel needs SERIAL_8250_CONSOLE when using a real serial port as a console
2012-08-06 08:13:06 -04:00
Shea Levy
1b615f460b
Allow overriding all NixOS tests to run with the minimal kernel possible for that test's config(s) (based on requiredKernelConfig)
2012-08-04 09:45:26 -04:00
Peter Simons
d13a3c741a
spamassassin: call daemon with complete path
2012-08-03 18:07:06 +02:00
Eelco Dolstra
d5d8acfacd
Assign uid/gid 54 to wwwrun
2012-08-03 11:05:25 -04:00
Eelco Dolstra
23cb924fbf
Don't try to change the uid/gid of existing users
...
Unless we search the entire filesystem to do a chown *and* restart
existing processes owned by that user, there is no sensible way that
we can change uids/gids. So don't try.
2012-08-03 11:03:56 -04:00
Eelco Dolstra
0a0c28f812
Revert "Add services.httpd.fixUidAndGid option to assign reliable numeric UID and GID for the Apache user."
...
This reverts commit 0ef085d58a
.
2012-08-03 10:52:53 -04:00
Peter Simons
0ef085d58a
Add services.httpd.fixUidAndGid option to assign reliable numeric UID and GID for the Apache user.
...
The option is disabled by default so that previously existing installations
aren't affected.
If you'd like to migrate to the fixed numeric id for Apache, set "fixUidAndGid
= true", edit the file "/etc/groups" and replace the old GID value with 54.
(NixOS can't do that for you because it refuses to change a GID that identifies
the primary group of a user.) Then run
find / -xdev -uid $oldUID -exec chown 54 {} +
find / -xdev -gid $oldGID -exec chgrp 54 {} +
to update ownership of all files that are supposed to be owned by Apache.
2012-08-03 16:39:55 +02:00
Eelco Dolstra
29f721ba54
Only create the Apache user/group if it's "wwwrun"
2012-08-03 09:35:06 -04:00
Peter Simons
1b249eaf05
Initial version of a SpamAssassin service.
...
The configuration is expected to be managed by the user in /etc/spamassassin.
2012-08-03 15:11:28 +02:00
Eelco Dolstra
1fcef0a0e0
Don't use nixUnstable
2012-08-02 13:31:57 -04:00
Rickard Nilsson
a6039e1be2
LUKS root: Fix key file check
...
Check for null instead of empty string
2012-08-02 11:39:31 +02:00
Rickard Nilsson
0958b224ac
LUKS root: Add option for using a key file instead of a passphrase.
2012-08-02 11:30:33 +02:00
Rickard Nilsson
ecdbc94e05
LUKS root: Add option allowDiscards (for SSD disks)
2012-08-02 11:27:28 +02:00
Shea Levy
feb010a366
NixOS kernels should support ELF executables
2012-08-02 00:47:36 -04:00
Shea Levy
3d20a308af
tests/minimal-kernel: Add CIFS timeout patch
2012-08-01 23:36:48 -04:00
Shea Levy
9e300052bd
Add test to check that a machine with a minimal kernel but all of the requiredKernelConfig options set boots and shuts down
2012-08-01 22:32:16 -04:00
Shea Levy
2a983acaff
Enable specifying which kernel config options are needed for a given module
2012-08-01 21:50:43 -04:00
Eelco Dolstra
5f57110e1f
install-grub.pl: Fix Xen support
2012-08-01 21:48:29 +02:00
Mathijs Kwik
52fd5ea6ca
gogoclient: setup config and dirs on service start, not on system activation
2012-07-31 20:07:05 +02:00
Eelco Dolstra
6576d81ff1
Fix "please: command not found" in switch-to-configuration
2012-07-30 15:19:30 -04:00
Eelco Dolstra
2678ff3726
Use /sys/fs/cgroup instead of /dev/cgroup
2012-07-30 13:49:18 -04:00
Eelco Dolstra
174d6a07e0
Fix whitespace
2012-07-30 13:49:10 -04:00
Eelco Dolstra
a559a2a606
mediawiki.nix: Use the right PHP build
2012-07-30 17:19:23 +02:00
Florian Friesdorf
14a8532ee0
add NIX_CONF_DIR to sudo env_keep variables (suggested by Eelco Dolstra)
...
this enables nix-collect-garbage under sudo to respect nix.conf, e.g.:
gc-keep-outputs = true
gc-keep-derivations = true
2012-07-27 12:25:11 +02:00
Peter Simons
e988324534
Use a dedicated user ('named') for BIND instead of running the daemon as super user.
2012-07-27 00:08:41 +02:00
Shea Levy
51765e6333
Merge pull request #20 from chaoflow/setuid-wrapper-newgrp
...
add setuid wrapper for newgrp
2012-07-26 11:11:10 -07:00
Florian Friesdorf
7c1c4c757c
add setuid wrapper for newgrp
2012-07-26 16:52:38 +02:00
Eelco Dolstra
16da4a14f1
amazon-image.nix: Don't put any old configurations in the GRUB menu
2012-07-25 16:38:05 -04:00
Eelco Dolstra
557f39aa0f
install-grub.pl: Apply the configuration limit only to old generations
2012-07-25 16:37:29 -04:00
Eelco Dolstra
8cae5e5782
Remove jfsrec from the minimal CD because it pulls in Boost
2012-07-25 11:39:41 -04:00
Eelco Dolstra
b52117c34d
Treat init-script as a boot loader
2012-07-25 11:30:16 -04:00
Eelco Dolstra
8b91a5f2ff
Move boot loader modules to modules/system/boot/loader
2012-07-25 10:59:03 -04:00
Eelco Dolstra
b15e1fbb08
Boot loader refactoring
...
- Renamed system.build.menuBuilder to system.build.installBootLoader.
- ‘install-grub.pl’ (formerly grub-menu-builder.pl) now generates the
GRUB menu *and* installs GRUB (if necessary).
- ‘switch-to-configuration.sh’ has no boot loader specific knowledge
anymore. It just calls installBootLoader.
2012-07-25 10:47:32 -04:00
Eelco Dolstra
1b743526bd
grub.nix: Handle null values
...
http://hydra.nixos.org/build/2894714
2012-07-25 09:27:51 -04:00
Eelco Dolstra
be4c4d79cf
grub-menu-builder: GRUB now installs unicode.pf2 automatically
2012-07-24 22:37:16 -04:00
Eelco Dolstra
a0721ad2b3
stage-1-init: Use mount --move to move /sys etc. to the target root
...
This fixes warnings about /sys/kernel/security during shutdown and
cleans up /proc/mounts.
2012-07-24 22:04:28 -04:00
Eelco Dolstra
fb15b1894e
Add missing progress message
2012-07-24 19:27:16 -04:00
Eelco Dolstra
f0c82f4543
Pass the ‘--recheck’ flag to grub-install
2012-07-24 19:22:19 -04:00
Eelco Dolstra
f07f221f0e
Replace grub-menu-builder with a much faster version
...
The old GRUB menu builder script is quite slow, typically taking
several seconds. This is a real annoyance since it's run every time
you switch to a new configuration. Therefore this patch replaces the
Bash script with a much faster Perl script. In a VirtualBox test, the
execution time went from 2.7s to 0.1s. The Perl version is also more
correct because it uses XML to get the GRUB configuration (through
builtins.toXML), so there are no shell escaping issues.
The new script currently lacks support for subconfigurations defined
through "nesting.children".
2012-07-24 19:16:27 -04:00
Eelco Dolstra
b3b6b8ad60
virtualbox-image.nix: VirtualBox disks are /dev/sda, not /dev/vda
2012-07-24 19:07:03 -04:00
Phreedom
cb063afcbf
F-Prot virus signaure database updater: package
2012-07-24 10:52:04 +03:00
Shea Levy
0f65521df2
Merge pull request #17 from MarcWeber/fix-init-script-builder
...
fix init-script-builder
2012-07-23 17:44:37 -07:00
Peter Simons
e8e19bbb1f
modules/services/web-servers/apache-httpd: rename 'apacheHttpd' option to 'package'
2012-07-24 01:01:48 +02:00
Peter Simons
b3627f6c69
modules/services/web-servers/apache-httpd: add apache user to the apache group
2012-07-23 22:00:35 +02:00
Peter Simons
52c97adaba
modules/services/web-servers/apache-httpd: make this module more configurable
...
- The new option 'apacheHttpd' determines the version of the Apache
HTTP Server that's being used by this module. The default version
is Apache 2.2.x, as before.
- The new option 'configFile' allows users specify their own custom
config file for the web server instead of being limited to the one
that this module generates.
2012-07-23 21:48:21 +02:00
Eelco Dolstra
5a0cf5e7b6
Use ext4 for VirtualBox images
2012-07-23 14:01:10 -04:00
Phreedom
4f109c8a3d
ClamAV: package virus fingerprint database updater.
2012-07-23 17:19:59 +03:00
Marc Weber
7ddea025e4
dont hardcode apache group name when setting permissions for state dir
2012-07-23 03:28:21 +02:00
Your Name
4549bad2f4
AppArmor: packaged
2012-07-22 16:31:49 +03:00
Your Name
8bde72d99c
Mount securityfs needed for AppArmor and some TPM drivers.
...
Should be harmless.
2012-07-22 16:31:49 +03:00
Marc Weber
3221159f5f
fix init-script-builder
2012-07-21 19:26:36 +02:00
Mathijs Kwik
26bf696350
Revert "allow out-of-tree nixos modules"
...
This reverts commit b609ff4fcf
.
It turns out this can just be done using "require".
2012-07-21 18:30:58 +02:00
Mathijs Kwik
b609ff4fcf
allow out-of-tree nixos modules
...
The environment variable "NIXOS_EXTRA_MODULES" is now checked to
contain a path to a file similar to modules/module-list.nix.
This gives the ability to include nixos modules that are not in the
nixos source tree.
This can be useful for modules that are still experimental, or which
aren't useful for other nixos users. Of course, this was already
possible to do this using a forked nixos tree, but with this
functionality, you can just rely on the nixos channel, easing things a
lot.
2012-07-21 17:35:50 +02:00
Eelco Dolstra
63742a942e
Don't create /var/log/upstart/<jobname> unless necessary
2012-07-18 17:09:00 -04:00
Lluís Batlle i Rossell
f43033a3f7
crashdump: it required some kernel options for the nmi_watchdog to work.
...
Now it says at boot, for every core:
NMI watchdog: enabled, takes one hw-pmu counter.
2012-07-18 21:50:18 +02:00
Peter Simons
4553a27a92
modules/security/pam.nix: add xscreensaver to the list of services
2012-07-17 13:01:09 +02:00
Eelco Dolstra
1d57489427
Global replace /var/run/opengl-driver -> /run/opengl-driver
2012-07-16 11:34:21 -04:00
Eelco Dolstra
98459eb675
Global replace /var/run/booted-system -> /run/booted-system
2012-07-16 11:34:21 -04:00
Eelco Dolstra
73532c3855
Global replace /var/run/current-system -> /run/current-system
2012-07-16 11:34:21 -04:00
Shea Levy
8c24de13e4
D'oh
2012-07-16 08:11:44 -04:00
Shea Levy
cdd8ecf9c7
multitouch: Invert left-right scrolling when invertScroll is enabled
2012-07-16 08:03:47 -04:00
Shea Levy
3d2b83c110
multitouch: Add an option to ignore palm touches
2012-07-14 21:40:49 -04:00
Shea Levy
c909ea9208
multitouch: Add option to invert scroll
2012-07-14 18:02:46 -04:00
Shea Levy
e3337c7f05
Add module for b43 firmware
2012-07-13 23:54:41 -04:00
Eelco Dolstra
57d74e6f4f
openssh.authorizedKeys.keyFiles: allow multiple keys
...
Ugly hack to get around the error "a string that refers to a store
path cannot be appended to a path". The underlying problem is that
you cannot do
"${./file1} ${./file2}"
but you can do
" ${./file1} ${./file2}"
Obviously we should allow the first case as well.
2012-07-13 17:59:03 -04:00
Eelco Dolstra
7e77dae458
sshd.nix: Create ~/.ssh/authorized_keys with the right ownership
2012-07-13 11:48:47 -04:00
Eelco Dolstra
7fca8ceaf8
/etc/login.defs: set the mode of new home directories to 700
2012-07-13 10:41:48 -04:00
Shea Levy
8544ba285d
logstash: Fix sloppy description fields
2012-07-12 14:35:06 -04:00
Shea Levy
a2b59f595f
logstash: Export config.lib.logstash.mk{Float,Hash,NameValuePairs}.
...
This allows hiding the implementation details for how to represent logstash
config types that don't directly map to nix expressions, particularly floats,
hashes, and name-value pair sets with repeated names. Instead of setting
__type and value directly, the user now uses these convenience functions to
generate their logstash config.
2012-07-12 14:15:43 -04:00
Shea Levy
8712e1dafc
Add lib module for modules to provide helper functions
2012-07-12 13:46:04 -04:00
Peter Simons
0c12e29368
Don't add the i3 window manager to the system if it isn't enabled in configuration.nix.
2012-07-12 11:33:10 +02:00
Eelco Dolstra
7de6a7e8b0
Rename time.clockLocal -> time.hardwareClockInLocalTime.
2012-07-11 15:33:34 -04:00
Carles Pagès
008493f94c
Add option to keep hardware clock in local time.
2012-07-11 15:31:46 -04:00
Shea Levy
5412b1089f
logstash: Start process in /tmp
...
See https://logstash.jira.com/browse/LOGSTASH-107
2012-07-11 13:45:36 -04:00
Shea Levy
315087def1
logstash: use {name=; value='} attrsets for repeated name-value pairs instead of parallel lists
2012-07-11 11:59:00 -04:00
Shea Levy
3039caf5ad
Add logstash module.
...
Since the logstash config file seemed very similar to a nixexpr, I decided
to map directly from nixexprs to logstash configs. I didn't realize until
too far in that this solution was probably way over-engineered, but it
works.
2012-07-11 11:22:16 -04:00
Rok Garbas
b7398794ed
i3 window manager was not installed when enabled
2012-07-10 16:07:53 +02:00
Eelco Dolstra
fbf9ecf78a
Apache: make /var/run/httpd readable to wwwrun, as required by mod_cgid
2012-07-09 16:27:39 +02:00
Eelco Dolstra
d0c9a3ce32
Apache: build PHP against the right httpd
...
If httpd is built with a threaded MPM, then PHP needs to be built with
thread support as well.
2012-07-06 23:28:46 +02:00
Eelco Dolstra
18031e41bb
Apache: Add an option to set the MPM
...
Supported values are "prefork" (default), "worker" and "event"
(experimental in Apache 2.2 but not 2.4).
2012-07-06 14:23:55 -04:00
Eelco Dolstra
a07eb262a0
Apache: don't fork into the background due to Upstart weirdness
...
If Apache crashes during startup, Upstart for some reason shows the
job in the "start/running" state. As a workaround, don't fork.
2012-07-06 13:47:42 -04:00
Eelco Dolstra
46dce21bff
MediaWiki: Generalise the skins support
...
The new option ‘skins’ allows specifying a list of directories
providing skins to be added to the MediaWiki installation. The
‘defaultSkin’ option just sets the default.
2012-07-05 21:04:23 +02:00
Mathijs Kwik
a630b1f6f6
EFI shell got updated upstream, reflecting new hash
2012-07-05 08:31:44 +02:00
Eelco Dolstra
348691645d
Remove broken "nopipefail" option
...
http://hydra.nixos.org/build/2751337
2012-07-02 10:57:36 -04:00
Peter Simons
56373744b4
modules/config/networking.nix: recognize whether a local DNS resolver is available
...
resolvconf prefers a locally running BIND resolver over the forwarders; we just
have to tell it whether we have one or not. We use 'config.services.bind.enable'
to make that decision, assuming that people are not going to configure a local
BIND that won't respond to queries on 127.0.0.1. If we run into such a (weird)
case, then we'll need to introduce another variable for that purpose which can
be set independently from 'config.services.bind.enable'.
2012-07-02 15:01:02 +02:00