Rob Vermaas
6d6e8c3a56
Use same configuration for S3 as for EBS backed images.
2013-06-05 18:11:19 +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
Peter Simons
a8517b3bff
Merge pull request #170 from wizeman/atop
...
atop: Add basic config option for /etc/atoprc
2013-05-25 02:24:51 -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
73a03ab205
tests/misc.nix: Test nixos-rebuild --help
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