Eelco Dolstra
7d958dcdd1
Drop Upstart references
2012-08-17 11:02:12 -04:00
Eelco Dolstra
f903a3dcc8
dhcpcd.nix: Add a reload action for rebinding interfaces
2012-08-17 11:01:07 -04:00
Eelco Dolstra
2ce5abaedf
acpid.nix: Fix dependencies
2012-08-17 11:00:33 -04:00
Eelco Dolstra
8e8bad96d4
alsa.nix: Add job description
2012-08-17 11:00:14 -04:00
Eelco Dolstra
36f5c97b49
Use systemd-udevd instead of udevd
2012-08-16 16:34:49 -04:00
Eelco Dolstra
7e99541afe
Fix initrd for the latest lvm2
2012-08-16 15:37:13 -04:00
Eelco Dolstra
a025e7e7e2
Provide a common share between VMs to allow easy communication
...
Every VM now mounts a common SMB share on /tmp/shared.
2012-08-16 10:47:33 -04:00
Eelco Dolstra
0e3f03106f
postgresql.nix: Add an option for overriding the PostgreSQL package
2012-08-15 17:02:03 -04:00
Eelco Dolstra
d18c2afc6f
Add an ip-up target for services that require IP connectivity
2012-08-15 15:38:52 -04:00
Eelco Dolstra
981347429a
Add support for PartOf dependencies
2012-08-15 15:36:54 -04:00
Eelco Dolstra
c2b2a3369a
Fix dependencies of Apache and PostgreSQL
2012-08-14 18:15:37 -04:00
Eelco Dolstra
a133eb5991
Add some missing targets
...
Also make multi-user.target pull in remote-fs.target to mount remote
filesystems.
2012-08-14 18:14:48 -04:00
Eelco Dolstra
55b2736566
Add a target ‘fs.target’ that waits for all filesystems
2012-08-14 18:14:16 -04:00
Eelco Dolstra
11c3219c1c
Remove the ‘networking’ job
...
Systemd has ‘network.target’ for this purpose.
2012-08-14 18:12:16 -04:00
Eelco Dolstra
a44a7271a8
Warn about Upstart modules with an unknown startOn condition
2012-08-14 17:30:11 -04:00
Eelco Dolstra
9dce4bd9c5
Provide start/stop/status aliases as a convenience for Upstart users
2012-08-14 17:22:04 -04:00
Eelco Dolstra
7a7d04af8a
systemd: Use the kernel modules from /run/booted-system
...
This prevents failures in systemd-modules-load.service like "Failed to
lookup alias 'ipv6': Function not implemented".
2012-08-14 17:09:44 -04:00
Eelco Dolstra
4475294f57
Fix a hang during shutdown
...
Subtle: dhcpcd.service would call resolvconf during shutdown, which in
turn would start invalidate-nscd.service, causing the shutdown to be
cancelled. Instead, give nscd.service a proper reload action, and do
"systemctl reload --no-block nscd.service". The --no-block is
necessary to prevent that command from waiting until a timeout occurs
(bug in systemd?).
2012-08-14 16:45:50 -04:00
Eelco Dolstra
88bfdca8e0
stage-1: Use systemd-udevd instead of the old udevd
2012-08-14 15:31:15 -04:00
Peter Simons
a025e848e0
modules/security/sudo.nix: added 'wheelNeedsPassword' option (default: true)
...
Change this setting to 'false' to allow users in the 'wheel' group to execute
commands as super user without entering a password.
2012-08-13 14:37:32 +02:00
Shea Levy
85997a6692
mingetty: Don't make restartIfChanged optional
2012-08-12 11:44:00 -04:00
aszlig
c9e05f1ed8
stage-1: Load boot-time keymap by default.
...
This also removes the configuration option, as suggested by @edolstra.
2012-08-12 16:54:31 +02:00
aszlig
d809a9e6b2
mingetty: Option to not restart on service change.
...
This especially annoyed me whenver I was doing nixos-rebuild switch and getting
logged out on all consoles. With this there now is services.mingetty.dontRestart
for heavy VT users to deactivate this behaviour.
2012-08-12 13:50:50 +02:00
aszlig
eb0b2651b8
stage-1: Add option to load keymap during bootup.
...
As non-QWERTY keyboards don't feel so warm and cozy if they hug QWERTY LUKS
password prompts, it was on honor for me to serve King Dvorak XV to fight the
glorious keyboard war against... what?! Yes, I'm awake!
We're fighting with loadkeys to spit out busybox binary keymaps against loadkmap
(loadkeys does have a special target -b for that).
And yep, I'm somewhat abusing preLVMCommands, if someone got issues with that,
feel free to introduce a new substitute in stage-i-init.sh.
Sent from my iPhone
2012-08-12 13:38:36 +02:00
Shea Levy
15a1efe023
find modules/ -name \*.nix -print0 | xargs -0 sed -i 's/RT73Firmware/RalinkFirmware/g'
2012-08-11 12:34:35 -04:00
Lluís Batlle i Rossell
50350a15f1
Adding a rename line for rt73 -> ralink.
2012-08-11 14:54:43 +02:00
Lluís Batlle i Rossell
9e753f3a46
Removing rt73 module, adding ralink module.
...
The rt73 fw were a subset of ralink, and the nixpkgs url
for rt73 didn't work either. Ralink should make any rt73 card work.
2012-08-11 14:53:34 +02:00
Eelco Dolstra
39030211af
Add a unitConfig option to set the [Unit] section of units
2012-08-10 18:56:12 -04:00
Eelco Dolstra
e00967a54a
stage-2-init: Drop udev from the $PATH
2012-08-10 18:41:20 -04:00
Eelco Dolstra
a4a90685ea
switch-to-configuration: Handle swap devices
2012-08-10 15:52:47 -04:00
Eelco Dolstra
be5486813b
Add an "adm" group
...
Journald will chown all journal files to the adm group so that users
in that group can run "journalctl".
2012-08-10 15:25:04 -04:00
Eelco Dolstra
a3c75462c1
switch-to-configuration: Handle switching all systemd units
2012-08-10 15:15:59 -04:00
Lluís Batlle i Rossell
746b572ee6
stage2init: fix respecting 'noatime' mount options for /
...
We had a "mount -o remount,rw none /" that was setting back 'relatime',
although we had set 'noatime' at initrd mount. Removing the word 'none' fixed
it.
Specifying a device (in this case 'none'), makes mount to forget previous
device options. According to manpage, it says not to read fstab or mtab. But the
effect is that of setting 'relatime', if it was mounted 'noatime.
2012-08-10 20:51:13 +02:00
Eelco Dolstra
ce7ead7bd7
switch-to-configuration: Handle changes to fileSystems
...
We now automatically remount filesystems with changed options, mount
new filesystems, and unmount obsolete filesystems.
2012-08-10 10:56:55 -04:00
Eelco Dolstra
f31ab09b85
Set uniq type on boot.loader.kernelFile
2012-08-09 11:00:35 -04:00
Shea Levy
20d4dee426
The efi boot stub code should only be run if it is enabled
2012-08-09 10:37:43 -04:00
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
Eelco Dolstra
52b6e10315
Use systemd-modules-load.service to load required kernel modules
2012-08-06 16:52:08 -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
Eelco Dolstra
23947c26a8
Revert accidental commit
2012-08-06 15:53:04 -04:00
Eelco Dolstra
d33fd9a1f8
switch-to-configuration: Assume that services that are auto-restarting are going to fail
2012-08-06 15:48:46 -04:00
Eelco Dolstra
27f496c1ce
Make the VirtualBox guest services depend on /dev/vboxguest
...
Systemd #ftw
2012-08-06 14:59:58 -04:00
Eelco Dolstra
b11c5d5991
nscd: Ensure that invalidate-nscd starts after nscd
2012-08-06 12:26:52 -04:00
Eelco Dolstra
9f9ae7c7e9
Share option definitions between the systemd and Upstart compatibility modules
2012-08-06 11:45:59 -04:00
Eelco Dolstra
f74ffe3550
Remove obsolete Upstart shutdown job
2012-08-06 10:58:27 -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
Eelco Dolstra
2a91bb5282
switch-to-configuration: Print new units
2012-08-03 17:13:34 -04:00
Eelco Dolstra
320682a558
switch-to-configuration: Don't ellipsize log output
2012-08-03 14:39:59 -04:00
Eelco Dolstra
0d6b96a525
switch-to-configuration: Fix the call to install the boot loader
2012-08-03 14:07:43 -04:00
Eelco Dolstra
aa6fd9f8a2
switch-to-configuration: Handle unit template instances
2012-08-03 13:47:59 -04:00
Eelco Dolstra
bd3c9febc9
switch-to-configuration: Stop units in one call to systemctl
2012-08-03 13:29:56 -04:00
Peter Simons
d13a3c741a
spamassassin: call daemon with complete path
2012-08-03 18:07:06 +02:00
Eelco Dolstra
b6bd0a4f84
switch-to-configuration: Restart services that were manually started
2012-08-03 11:53:14 -04: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
Eelco Dolstra
56ce5614f9
switch-to-configuration: Print all failed services
2012-08-03 10:40:01 -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
4d2deff7af
Stop obsolete units, restart changed units, start new units
2012-08-02 17:26:23 -04:00
Eelco Dolstra
0fc68a3d1d
Rewrite switch-to-configuration in Perl
...
This will make it more efficient to do systemd dependency graph
processing (if necessary).
2012-08-02 15:11:29 -04:00
Eelco Dolstra
d4fec178fd
Merge remote-tracking branch 'origin/master' into systemd
2012-08-02 13:44:16 -04: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
Eelco Dolstra
e4ed2120fd
Create /etc/locale.conf and /etc/vconsole.conf
...
Systemd's systemd-vconsole-setup.service reads locale and console
font/keymap settings from these files. In particular, it sets the
virtual console to UTF-8 mode depending on the LANG setting.
This removed the need for the kbd job.
2012-07-24 13:53:17 -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
71ca633431
Start agetty on tty1
...
‘logind’ automatically starts agetty on all virtual consoles except
tty1. We have to do that ourselves.
2012-07-20 18:32:24 -04:00
Eelco Dolstra
0edf138fc7
switch-to-configuration: Initial systemd support
...
It reloads the configuration, but doesn't (re)start jobs yet.
2012-07-20 18:25:36 -04:00
Eelco Dolstra
fd2cef50cd
Don't pull in Upstart
2012-07-20 18:25:23 -04:00
Eelco Dolstra
7a98c884f8
dhcpcd.nix: Go into the background and restart ntpd
2012-07-20 18:24:55 -04:00
Eelco Dolstra
ee075bdf6b
agetty.nix: Add remark
2012-07-20 17:39:05 -04:00
Eelco Dolstra
77510eaa99
dbus.nix: Fix path to dbus-send
2012-07-20 17:38:36 -04:00
Eelco Dolstra
0b865edb16
switch-to-configuration: require a reboot going from Upstart to systemd
2012-07-20 16:23:52 -04:00
Eelco Dolstra
5fabcf63a3
Get delayed shutdowns to work
2012-07-20 15:40:50 -04:00
Eelco Dolstra
1602f8e162
Typo
2012-07-20 14:58:15 -04:00
Eelco Dolstra
1375e7951d
Enable systemd-journal-flush.service (added by systemd 187)
2012-07-20 12:02:42 -04:00
Eelco Dolstra
41cb04f793
Implement serial-getty@.service
2012-07-20 11:36:09 -04:00
Eelco Dolstra
02e37ba6b0
Shorten filenames of start scripts to make log messages more readable
2012-07-19 17:41:42 -04:00
Eelco Dolstra
ae62436697
Random changes
2012-07-19 17:33:22 -04:00
Eelco Dolstra
6419172bc2
journald: enable logging to the console
2012-07-19 17:32:50 -04:00
Eelco Dolstra
425ec4cb00
syslogd: Make it work with systemd
...
Also made syslogd optional (and disabled by default).
2012-07-19 12:48:30 -04: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
917e53a2d2
Update units names for systemd-186
2012-07-16 17:47:11 -04:00
Eelco Dolstra
94daecd90b
save-hwclock.service: support time.hardwareClockInLocalTime
2012-07-16 17:32:26 -04:00
Eelco Dolstra
44d091674b
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/config/networking.nix
modules/services/networking/ssh/sshd.nix
modules/services/ttys/agetty.nix
modules/system/boot/stage-2-init.sh
modules/system/upstart-events/shutdown.nix
2012-07-16 17:27:11 -04: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
Peter Simons
f22dbd5e05
modules/services/networking/wpa_supplicant.nix: strip trailing whitespace
2012-06-29 11:53:16 +02:00
Peter Simons
61b8ee9029
modules/services/networking/wpa_supplicant.nix: document that interface auto-detection doesn't work on Linux 3.4.x
2012-06-29 11:53:16 +02:00
Eelco Dolstra
bf15293b1e
Merge branch 'master' of github.com:NixOS/nixos into systemd
...
Conflicts:
modules/services/hardware/udev.nix
2012-06-28 14:19:38 -04:00
Eelco Dolstra
76c74cd7c7
initrd: Detect filesystem type before doing fsck/mount
...
BusyBox doesn't handle the "auto" filesystem type very well: fsck will
just ignore such filesystems, and mount will only work properly if the
required kernel module is already loaded. Therefore, use blkid to
determine the filesystem type.
Also generate an /etc/fstab in the initrd rootfs on the fly. This is
useful if you're dropped into an emergency shell since it allows you
to say "fsck /dev/sda1" or "mount /dev/sda" and have the right thing
happen.
2012-06-28 10:55:44 -04:00
viric
7acfd8ec20
Merge pull request #9 from viric/pull-pipefail
...
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-28 01:20:22 -07:00
Lluís Batlle i Rossell
34e8f68056
system-tarball-pc: not use boot.initrd.extraTools anymore
...
Eelco removed the option recently, making the default initrd have the full
busybox.
I saw this evaluation error in the hydra nixos trunk page.
2012-06-27 22:26:27 +02:00
Lluís Batlle i Rossell
de87b07bb3
nixos-rebuild: fail if any case of pull fails.
2012-06-27 21:57:15 +02:00
Lluís Batlle i Rossell
5b7c019e2a
nixos-rebuild: make 'pull' fail in case it did not pull anything.
2012-06-27 21:36:46 +02:00
David Guibert
dbe2325603
fix the grep pattern finding programs called by absolute paths in udev rules.
2012-06-27 20:41:07 +02:00
Shea Levy
bb5d2d53fe
try isn't used, so use the more compatct seq 10
2012-06-27 09:43:54 -04:00
Mathijs Kwik
061a998840
luks root: c-style for-loop -> seq
...
The ash shell no longer supports this bash-specific syntax.
This left systems that use luksroot unable to boot.
2012-06-27 09:42:55 -04:00
Eelco Dolstra
e64bdda52b
Don't use weird 777 permissions on unmounted /dev/shm
2012-06-27 09:35:53 -04:00
Eelco Dolstra
cc357c7e64
nixos-rebuild: Add a convenience option ‘--upgrade’
...
This is equivalent to running ‘nix-channel --update nixos’ before
running ‘nixos-rebuild’.
2012-06-25 16:17:34 -04:00
Eelco Dolstra
7613ae950a
Fix booting on EC2
...
The kill command in ash doesn't know the "--" syntax, but doesn't need
it either.
2012-06-24 19:02:34 -04:00
Eelco Dolstra
bd0f065c05
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 18:20:26 -04:00
Eelco Dolstra
6bd32f0a27
Drop the socat wrapper
2012-06-22 15:37:22 -04:00
Eelco Dolstra
1da7cea223
Add Busybox to the installation CD
...
This is mostly to get the automated tests to succeed.
2012-06-22 14:16:55 -04:00
Eelco Dolstra
980ba4d5a5
stage-1: mount /proc, /sys, /dev in the target root
...
The switch_root in BusyBox doesn't do this (while the one in
util-linux does). So we have to do this ourselves.
2012-06-22 13:51:42 -04:00
Eelco Dolstra
598adfee3e
Fix booting from the CD-ROM
...
So it turns out that BusyBox doesn't auto-load modules for filesystems
that have type "auto", e.g. it doesn't figure out that it should load
the "iso9660" module should be loaded when mounting the CD-ROM. We
don't want to give the root FS on the CD type "iso9660", because that
breaks booting from a USB stick created by unetbootin. So make sure
the "iso9660" module is loaded.
2012-06-22 11:55:23 -04:00
Eelco Dolstra
7b54922227
Don't include klibc in the installation CD
2012-06-22 11:39:27 -04:00
Eelco Dolstra
872a76b177
Merge branch 'master' of github.com:NixOS/nixos into systemd
2012-06-22 11:11:21 -04:00
Eelco Dolstra
9692495df0
Use BusyBox in the initrd
...
Using BusyBox instead of Bash plus a bunch of other tools gives us a
much more feature-full, yet smaller initrd. In particular, BusyBox
contains networking commands such as ip and a DHCP client, useful for
NFS boots. It's also much more convenient for rescue situations
because the shell has builtin readline support and there are many more
tools (including vi).
2012-06-22 10:43:06 -04:00
Eelco Dolstra
70089950d2
nixos-version: "pre-svn" -> "pre-git"
2012-06-22 10:28:06 -04:00
Rob Vermaas
df124ebc89
* Make sure time.timeZone can only be defined once.
2012-06-21 12:47:44 +02:00
Eelco Dolstra
055eae2a58
Merge pull request #1 from aszlig/i3_integration
...
Add xserver integration of i3 WM.
2012-06-20 20:49:45 -07:00
Eelco Dolstra
337423af8e
Backdoor: depend on /dev/hvc0
...
Systemd is the shit: units can declare a dependency on the appearance
of device nodes. Yay!
2012-06-19 17:36:02 -04:00
Eelco Dolstra
2fa1ba85c6
Enable the systemd password agents
2012-06-19 17:02:54 -04:00
Eelco Dolstra
2526afb1c7
Don't use ConsoleKit
2012-06-19 16:22:26 -04:00