Eelco Dolstra
b3f04718cf
Use stable Nix by default
2013-06-11 12:10:58 +02:00
Zef Hemel
bcf3a7bbf6
Fixed: now using the configured redis package.
2013-06-07 11:37:58 +02:00
Zef Hemel
6b4d76c2c2
Added redis service with bunch of documentation.
2013-06-07 11:34:05 +02:00
Vladimír Čunát
2451d1794b
Merge branch 'master' into x-updates
2013-06-05 17:22:35 +02:00
Eelco Dolstra
365307ada1
nixos-rebuild: Handle .version-suffix not being writable
...
Reported by @vcunat.
2013-06-05 17:10:46 +02:00
Eelco Dolstra
d210f30fa7
Omit GRUB if boot.loader.grub.device is set to "nodev"
...
If we only need to generate a GRUB boot menu, we don't need GRUB
itself. This cuts 38 MiB from EC2 system closures (in particular
because it gets rid of the need for the 32-bit Glibc).
2013-06-04 14:07:25 +02:00
Evgeny Egorochkin
2b63b67aa4
Merge pull request #174 from wizeman/apparmor-transmission
...
transmission: Add apparmor profile
2013-06-04 03:20:49 -07:00
Evgeny Egorochkin
6e6061e6b3
TOR: add obfsproxy support by default for TOR bridges
2013-06-04 13:03:37 +03:00
Mathijs Kwik
824b5b645a
openvpn: fix type error
...
either use
- optional cond "target"
or
- optionals cond ["target1" "target2"]
2013-06-04 07:45:58 +02:00
Sander van der Burg
e776c0623d
Fixed disnix service to use systemd's dependency facilities
2013-06-03 01:34:22 +02:00
Evgeny Egorochkin
e3bbf38ec9
Merge pull request #178 from bjornfor/lighttpd-cgit-subservice
...
lighttpd: add cgit sub-service
2013-06-02 14:18:21 -07:00
Evgeny Egorochkin
6ab6eeceb7
Merge pull request #179 from bjornfor/lighttpd-gitweb-improvements
...
lighttpd: gitweb: add extraConfig option
2013-06-02 14:09:23 -07:00
Bjørn Forsman
3d48da72a9
lighttpd: gitweb: add extraConfig option
...
So that we can append custom configuration text to the end of the
generated gitweb.conf file.
2013-06-02 19:26:55 +02:00
Bjørn Forsman
b1f82e428a
lighttpd: add cgit sub-service
...
(cgit is "a hyperfast web frontend for git repositories written in C")
cgit is enabled like this (assuming lighttpd is already enabled):
services.lighttpd.cgit.enable = true;
and configured verbatim like this (contents of the cgitrc file):
services.lighttpd.cgit.configText = ''
cache-size=1000
scan-path=/srv/git
'';
cgit will be available from this URL: http://yourserver/cgit
In lighttpd, I've ensured that the cache dir for cgit is created if cgit
is enabled.
2013-06-02 18:41:18 +02:00
Lluís Batlle i Rossell
70fd5422a7
Adding iw to systemPackages.
2013-06-02 14:27:39 +02:00
Peter Simons
08eba4c114
atd: don't enable at daemon by default
...
The at daemon doesn't work on NixOS [1], so enabling it by default
doesn't seem useful. I'd argue that it shouldn't be enabled by default
even if it worked, actually.
[1] http://lists.science.uu.nl/pipermail/nix-dev/2013-April/011048.html
2013-06-01 11:39:09 +02:00
Evgeny Egorochkin
3bb97667b8
Merge pull request #167 from wizeman/domain
...
Set the domain name of the machine
2013-05-30 09:14:25 -07:00
Vladimír Čunát
a5a7c8ad78
Merge branch 'master' into x-updates
2013-05-29 23:32:05 +02:00
Vladimír Čunát
40d61bfe36
Revert "networkmanager: clean some attrs missing in nixpkgs x-updates"
...
This reverts commit a649bbea4e
.
2013-05-29 23:31:47 +02:00
Evgeny Egorochkin
421fb9d585
Merge pull request #173 from wizeman/apparmor-service
...
Apparmor service fixes
2013-05-28 16:46:30 -07:00
Evgeny Egorochkin
a518e09ec3
Merge pull request #172 from wizeman/apparmor-ping
...
apparmor: Fix broken iputils/ping profile
2013-05-28 16:37:11 -07:00
Domen Kozar
53390a2da9
add networkmanager_openvpn to systemPackages
2013-05-29 00:38:50 +02:00
Ricardo M. Correia
0a0beadecd
transmission: Add apparmor service dependency
2013-05-28 18:00:21 +00:00
Ricardo M. Correia
531b581636
apparmor: Fix service stop
...
When stopping the apparmor service, the profile removal failed with
parsing errors due to not including the
${pkgs.apparmor}/etc/apparmor.d directory.
2013-05-28 17:49:52 +00:00
Ricardo M. Correia
84c0af80d7
apparmor: Fix loading multiple profiles
...
apparmor's systemd service wasn't working when multiple profiles were
defined, due to the ExecStart commands in the service file being
broken into multiple lines, instead of being separated by ';'.
2013-05-28 17:21:22 +00:00
Ricardo M. Correia
2e61811284
transmission: Add apparmor profile
2013-05-28 17:19:15 +00:00
Ricardo M. Correia
eb01d87b31
apparmor: Fix broken iputils/ping profile
2013-05-28 14:17:29 +00:00
Eelco Dolstra
2ec6759f5f
openvpn.nix: Use systemd.*
...
Also add an option ‘autoStart’ to configure whether an OpenVPN
instance should be started automatically. And don't log to
/var/log/openvpn-* anymore.
2013-05-28 14:39:48 +02:00
Ricardo M. Correia
7f9fc8d817
Set the domain name of the machine
...
The domain name was not being set before, even if the administrator
properly configured the networking.domain option in
/etc/nixos/configuration.nix.
2013-05-28 08:49:14 +00:00
Lluís Batlle i Rossell
f60393975f
gnunet: it was missing extraGroups
2013-05-28 10:19:59 +02:00
Peter Simons
717dc3b858
Merge pull request #169 from wizeman/chrony
...
Add chrony service
2013-05-25 02:25:57 -07:00
Ricardo M. Correia
76046850fe
atop: Add basic config option for /etc/atoprc
2013-05-23 11:14:24 +00:00
Ricardo M. Correia
6336048c58
chrony: properly set rtconutc option, and add a few more options
2013-05-23 03:00:09 +00:00
Ricardo M. Correia
02d9a8066a
Add chrony service
...
Also, do not build and add ntp to the system unless it is enabled.
2013-05-23 02:07:49 +00:00
Rickard Nilsson
70586f03fe
systemd.sockets: Add listenStreams option for specifying several sockets
2013-05-20 16:26:24 +02:00
Domen Kozar
a29c306958
bacula: add ExecReload
2013-05-18 13:29:54 +02:00
Domen Kozar
000d5a62aa
bacula: file daemon needs to run as root
2013-05-18 12:29:14 +02:00
Eelco Dolstra
07406231e3
zabbix: Don't set the mbstring.func_overload option
...
This breaks MediaWiki running in the same web server. Zabbix no
longer seems to need it anyway.
2013-05-17 15:34:26 +02:00
Eelco Dolstra
97689f9062
mediawiki: Update to 1.20.5
2013-05-17 13:38:20 +02:00
Mathijs Kwik
0e9a963b42
kde4: use udisks2 for kde versions that support it.
...
Currently, none do, although kde 4.10 is supposed to be able to use it.
2013-05-17 09:33:00 +02:00
Mathijs Kwik
4630ad4d26
filesystems: add priority option for swap devices.
...
Useful for setting up raid0-like load balancing for swap.
By giving multiple swap devices the same prio.
2013-05-17 09:22:07 +02:00
Mathijs Kwik
085ccc8199
btrfs: btrfsck is now actually the same binary as "btrfs"
...
symlinked to save space.
2013-05-17 09:22:07 +02:00
Vladimír Čunát
a13d1c3363
mesa WIP: fix bad symlinking, thanks to jack_c on IRC
2013-05-16 23:52:17 +02:00
Domen Kozar
40fb90a295
bacula: generate bconsole config
2013-05-16 21:58:24 +02:00
Vladimír Čunát
a649bbea4e
networkmanager: clean some attrs missing in nixpkgs x-updates
...
Just temporary hack.
2013-05-16 17:24:26 +02:00
Vladimír Čunát
0ad87ab46e
WARNING: history will change from now on (mesa updates)
...
Fix some paths set, drivers in mesa_drivers now, WIP.
2013-05-16 17:23:31 +02:00
Evgeny Egorochkin
da7d6a4cce
Merge pull request #125 from MarcWeber/submit/when-enabling-wacom-add-xsetwacom-to-path
...
When enabling wacom put xsetwacom in PATH.
2013-05-15 09:51:17 -07:00
Rob Vermaas
3b00eca8e9
Add varnish to module-list.nix
2013-05-15 14:36:17 +02:00
Eelco Dolstra
0277126699
Return exit code 127 if a command is not found
2013-05-15 12:52:15 +02:00
Eelco Dolstra
95d02c0c40
initrd: Remove serio and atkbd
...
These modules don't exist as far as I can tell.
2013-05-15 12:52:15 +02:00
Eelco Dolstra
b3ae70ddb6
initrd: Add ehci_pci and hid_generic
...
These are required to get some (all?) USB keyboards to work in recent
kernels.
2013-05-15 12:52:14 +02:00
Eelco Dolstra
f5233bbf82
Remove tabs
2013-05-15 12:52:14 +02:00
Shea Levy
2c4db1a6cf
Don't copy libz and liblzo2 twice to the initrd
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-14 23:35:10 -04:00
Shea Levy
51bc82960a
btrfsck doesn't respect any flags
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-13 14:25:48 -04:00
Shea Levy
9b4991d3f4
Fix btrfs in the initrd.
...
With NixOS/nixpkgs@7761952d06 , btrfs requires libz and liblzo2
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-13 14:16:53 -04:00
Shea Levy
7f7ada53cf
Add a basic (currently failing) sanity check for btrfsProgs-in-initrd
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-13 14:07:38 -04:00
Domen Kozar
edd77af3fe
add openvpn config file to networkmanager service
2013-05-13 17:52:26 +02:00
Eelco Dolstra
4e6f6d0215
Use pam_loginuid
...
This set the loginuid property of processes for auditing.
2013-05-13 11:27:21 +02:00
roconnor
aa1289dd91
Merge pull request #159 from NixOS/nginx-fullWebDAV
...
Add options for user and group to run nginx as.
2013-05-12 15:32:59 -07:00
Rob Vermaas
0f930a00f8
Add varnish module
2013-05-12 20:32:25 +02:00
Jaka Hudoklin
b345417bc5
Fix pxe network boot
2013-05-11 19:42:19 +00:00
Domen Kozar
078130767d
add openvpn plugin to networkmanager
2013-05-11 19:25:14 +02:00
Bjørn Forsman
09a7d18cc3
transmission.service: fix ignored ExecReload setting
...
This is what currently happens (from the journal log):
[/nix/store/HASH-unit/transmission.service:27] Executable path is not absolute, ignoring: kill -HUP $MAINPID
Fix it by using absolute path to kill.
2013-05-11 12:15:35 +02:00
Evgeny Egorochkin
748ab74d1f
AppArmor profiles for SUID binaries. At this moment only for ping.
2013-05-11 08:41:36 +03:00
Evgeny Egorochkin
d7cc2415ea
AppArmor: try converting to a systemd unit
2013-05-11 08:40:45 +03:00
Evgeny Egorochkin
a9e4eca8bf
Apparmor: check that we are running an AppArmor-enabled kernel.
2013-05-10 16:07:56 +03:00
Evgeny Egorochkin
44eb1bac65
Apparmor: add a warning
2013-05-10 14:57:48 +03:00
Eelco Dolstra
ffb581c739
Fix suspend in systemd
...
Systemd 203 expects the file /etc/systemd/sleep.conf to exist,
otherwise suspend doesn't work.
2013-05-09 16:26:13 +02:00
Eelco Dolstra
ebac0220d1
systemd.nix: Use environment.etc attribute syntax
2013-05-09 16:26:12 +02:00
Lluís Batlle i Rossell
4e38d152ed
Adding synclient to systemPackages if synaptics is enabled.
2013-05-09 15:01:16 +02:00
Lluís Batlle i Rossell
4f71bce691
Adding miniupnpc to gnunet path, to be able to use upnp
2013-05-07 18:53:28 +02:00
Eelco Dolstra
6089b5b50c
Increase PostgreSQL's shutdown timeout to 3 minutes
...
1 minute is too short, given that the autovacuum launcher often seems
to require exactly 1 minute to shut down. (This might be a bug
related to autovacuum_naptime.)
2013-05-07 15:00:36 +02:00
Eelco Dolstra
8af81ad66b
Don't start nscd if it's not already running
...
"systemctl restart" will start a service if it's not already
running...
2013-05-07 14:22:35 +02:00
Russell O'Connor
9c62645273
Add braces to fix compilation errors.
...
I don't understand how Apache gets away without them.
2013-05-06 11:11:04 -04:00
Russell O'Connor
76b7dea805
Make nginx uid and gid optional.
2013-05-06 10:49:23 -04:00
Evgeny Egorochkin
dc389c5d1e
lighttpd: add gitweb as a sub-service
...
Now you can access gitweb at http://yourserver/gitweb by simply adding
this to configuration.nix (assuming services.lighttpd.enable = true);
services.lighttpd.gitweb.enable = true;
The path to all bare repositories served by gitweb can be set with this
option (default value below):
services.lighttpd.gitweb.projectroot = "/srv/git";
Based on patch contributed by Bjørn Forsman.
2013-05-06 13:51:09 +03:00
Evgeny Egorochkin
161086b205
lighttpd: add services.lighttpd.mod_status option
...
If true, show server status overview at /server-status, statistics at
/server-statistics and list of loaded modules at /server-config.
Patch contributed by Bjørn Forsman.
2013-05-06 13:51:09 +03:00
Evgeny Egorochkin
4b435b173f
lighttpd: add services.lighttpd.mod_userdir option
...
If true, requests in the form /~user/page.html are rewritten to take
the file public_html/page.html from the home directory of the user.
Default is off.
Patch contributed by Bjørn Forsman.
2013-05-06 13:51:08 +03:00
Evgeny Egorochkin
5e32c9c8eb
lighttpd: generate a default config file
...
Instead of forcing users to configure lighttpd manually, make it an
option. The current services.lighttpd.configText option can still be
used for manual configuration, but if it is left blank (default) we'll
use the new generated config file.
The generated config file ensures that the server drops root priveleges
and runs as the "lighttpd" user. It pulls in some new config params that
can be set in configuration.nix (here with default values):
services.lighttpd.document-root = "/srv/www"
services.lighttpd.port = 80
services.lighttpd.extraConfig = "" # appended to the generated file
And it enables access and error logging to the systemd journal.
Patch contributed by Bjørn Forsman.
2013-05-06 13:51:08 +03:00
Evgeny Egorochkin
39ba755873
Move lighttpd.nix to lighttpd/default.nix
...
So that we later can add sub-services for lighttpd without polluting the
web-servers/ directory.
2013-05-06 13:51:08 +03:00
Russell O'Connor
7c8c1dade5
Add options for user and group to run nginx as.
...
Add option to compile in full WebDAV support.
2013-05-05 15:44:06 -04:00
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