Vladimír Čunát
619a1f5614
changes proposed for 13-10 update
...
One feature change: polkit update 8d14c7ba
2013-11-09 18:41:42 +01:00
Jaka Hudoklin
673fc81337
nixos/graphite: fix storage dir for carbon
2013-11-09 17:36:05 +01:00
Vladimír Čunát
8d14c7baa6
polkit: major update 0.105 -> 0.112
...
- It now uses JavaScript for configuration (only),
so I had to "convert" config for NetworkManager.
- I tested suspend/restart/(un)mount on KDE/Xfce,
Phreedom tested NetworkManager config conversion.
2013-11-09 16:29:18 +01:00
Domen Kožar
b3ea42462c
Merge pull request #1182 from offlinehacker/nixos/mongodb/userfix
...
nixos/mongodb: set static uid to work with #1076
2013-11-08 12:56:00 -08:00
Domen Kožar
a623cc96e3
Merge pull request #1066 from offlinehacker/nixos/logstash/update
...
nixos/logstash: update and simplify to be fully compatible with new version
2013-11-08 11:44:17 -08:00
Eelco Dolstra
065493284f
Update the X11 terminal server module for systemd
...
Yay, we no longer need inetd!
2013-11-08 16:39:22 +01:00
Eelco Dolstra
e62e15b2f9
Only run systemd-inhibit for local X11 sessions
2013-11-08 16:39:22 +01:00
Eelco Dolstra
cc65b1015d
vsftpd: Disable seccomp filtering on 64-bit
...
It worked on Linux 3.4 but fails with "500 OOPS: priv_sock_get_cmd"
since we updated the default kernel to 3.10.
http://hydra.nixos.org/build/6715359
https://bugzilla.redhat.com/show_bug.cgi?id=845980
https://bugzilla.novell.com/show_bug.cgi?id=786024
2013-11-07 16:38:57 +01:00
Eelco Dolstra
000962c3fb
vsftpd: Run in the background and log to syslog (i.e. journal)
2013-11-07 16:38:57 +01:00
Eelco Dolstra
10e31f6de7
Clean up the vsftpd module a bit
2013-11-07 16:38:57 +01:00
Domen Kožar
a46c71857d
Merge pull request #1172 from zefhemel/patch-1
...
Removed unnecessary mkIf in elasticserach
2013-11-07 03:11:11 -08:00
Michael Raskin
e8b347e6ae
Merge pull request #1167 from grwlf/serverflags
...
Add serverFlagsSection option to the xserver config
2013-11-07 03:00:37 -08:00
Michael Raskin
f8ddc0cbd4
Merge pull request #1099 from offlinehacker/nixos/nginx/package_change_support
...
nixos/nginx: allow to specify which package to use
2013-11-07 02:59:09 -08:00
Michael Raskin
0cfc45c3b9
Merge pull request #1164 from kirelagin/master
...
Make touchpad button mapping configurable
2013-11-07 02:49:44 -08:00
Jaka Hudoklin
50a2f3fdce
nixos/mongodb: set static uid to work with #1076
2013-11-07 11:25:14 +01:00
Sander van der Burg
d31b328d0a
Updated Disnix service definition to support new development version and mongo databases
2013-11-07 10:54:53 +01:00
Alex Berg
0427e7fbf2
Check for SSL Cert value before building with SSL support.
2013-11-06 11:20:14 +08:00
Zef Hemel
8063382867
Removed unnecessary mkIf
...
The whole block is already wrapped in cfg.enable and this breaks some things.
2013-11-05 08:52:23 +01:00
Eelco Dolstra
d9c13a73c2
gurobi: Remove
...
It's proprietary, non-redistributable software.
2013-11-05 00:07:24 +01:00
Domen Kožar
a734f32fa1
Remove desktopManager.gnome
...
Gnome doesn't work at least since I started using NixOS half a year
ago, let's not give wrong impressions to newcomers. Packaging gnome3
is still something on horizon.
2013-11-04 18:12:38 +01:00
Sergey Mironov
99914f8581
Add serverFlagsSection parameter to the xserver config
2013-11-04 18:54:13 +04:00
Moritz Ulrich
882c2b7278
fcron: Fix error when cron.mailto is null.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-04 11:07:11 +00:00
Kirill Elagin
fce38e454b
Make touchpad button mapping configurable
2013-11-03 13:00:49 +04:00
Jaka Hudoklin
1453be4740
nixos/logstash: add option examples
2013-11-01 17:15:54 +01:00
Jaka Hudoklin
10e61f53d8
nixos/logstash: update and simplify to be fully compatible with new version
2013-11-01 17:15:53 +01:00
Eelco Dolstra
9ef07d859b
Include the NixOS version in the manual
...
In particular, this will make it clear what version of the manual is
shown at http://nixos.org/nixos/manual/ .
2013-11-01 16:47:29 +01:00
Eelco Dolstra
444a4fb793
Loosen the type of SSH key files
2013-11-01 00:34:31 +01:00
Eelco Dolstra
c1159edc65
Remove remaining references to Upstart
2013-10-31 13:26:06 +01:00
Eelco Dolstra
456d8ec52b
Clean up Synergy option descriptions a bit
2013-10-31 13:18:00 +01:00
Eelco Dolstra
244cf195c8
Use the "assertions" option instead of mkAssert
2013-10-30 18:47:44 +01:00
Eelco Dolstra
7d5152964c
Drop environment.x11Packages
...
It doesn't do anything useful compared to environment.systemPackages.
2013-10-30 18:47:43 +01:00
Eelco Dolstra
408b8b5725
Add lots of missing option types
2013-10-30 18:47:43 +01:00
Eelco Dolstra
be5d3a59dd
Clean up some option examples
2013-10-30 18:47:43 +01:00
Eelco Dolstra
70a2c54527
Strictly check the arguments to mkOption
...
And fix various instances of bad arguments.
2013-10-30 15:35:09 +01:00
Eelco Dolstra
db2a9afb75
Remove obsolete xfceutils attribute
2013-10-30 15:35:09 +01:00
Eelco Dolstra
e3e3666e24
smartd.nix: Fix broken option type
2013-10-30 14:57:43 +01:00
Eelco Dolstra
862e3dd977
Substitute "types.uniq types.string" -> "types.str"
2013-10-30 14:57:42 +01:00
Eelco Dolstra
1d104c792b
Remove the dhclient module
...
It's no longer used by NixOS (replaced by dhcpcd).
2013-10-29 17:39:32 +01:00
Eelco Dolstra
0695b68c8c
Manual: Render multi-line strings properly
2013-10-29 17:39:31 +01:00
Rok Garbas
562b453b93
nixos: haproxy module
2013-10-29 15:55:25 +01:00
Eelco Dolstra
985f1f2d8a
Give types to the Apache httpd options
2013-10-29 14:03:39 +01:00
Eelco Dolstra
f0b7b0af12
wpa_supplicant.nix: Add option types
2013-10-29 13:14:30 +01:00
Rok Garbas
38df1d24c4
nixos: zope2 service: adding clientHome option
2013-10-29 12:53:08 +01:00
Eelco Dolstra
98ae32286f
Fix evaluation error in the tomcat test
2013-10-29 01:26:51 +01:00
Eelco Dolstra
738a6c173a
Don't copy Nix expressions to the store while processing Apache subservices
2013-10-29 01:20:33 +01:00
Eelco Dolstra
c9dad37f01
Remove obsolete function addDefaultOptionValues
2013-10-28 22:45:58 +01:00
Eelco Dolstra
f8a9eb9f00
Implement services.httpd.virtualHosts using the module system
2013-10-28 22:45:58 +01:00
Eelco Dolstra
30a36f9a80
Remove remaining uses of mkOverrideTemplate
2013-10-28 22:45:58 +01:00
Eelco Dolstra
259f7a93b1
Rename environment.nix -> nix.package
2013-10-28 22:45:57 +01:00
Eelco Dolstra
d5047faede
Remove uses of the "merge" option attribute
...
It's redundant because you can (and should) specify an option type, or
an apply function.
2013-10-28 22:45:56 +01:00
Eelco Dolstra
f4a418761b
Check for undeclared options
2013-10-28 22:45:56 +01:00
Eelco Dolstra
a40583e7e4
Fix bogus mkOption types
...
Among others, systemd unit options were not being type-checked because
of this. mkOption should really check its arguments better...
2013-10-28 22:45:56 +01:00
Eelco Dolstra
89bd18b3af
Fix manual generation
2013-10-28 22:45:56 +01:00
Eelco Dolstra
7cf0e0bda8
Manual: Fix bad \" characters
2013-10-28 22:45:56 +01:00
Eelco Dolstra
4b1a9dd00b
Remove uses of mkFixStrictness
...
mkFixStrictness is no longer needed, woohoo!
2013-10-28 22:45:55 +01:00
Eelco Dolstra
2cc37c17d9
openvpn.nix: Improve types
2013-10-28 22:45:55 +01:00
Eelco Dolstra
41c8f9598e
Remove dead code
2013-10-28 22:45:54 +01:00
Jaka Hudoklin
d28a9619a1
nixos/redis: log to syslog by default
2013-10-28 18:18:24 +01:00
Jaka Hudoklin
b20c08d2cb
nixos/redis: user set uid, make it compatible #1076
2013-10-28 18:18:13 +01:00
Jaka Hudoklin
c1ad189295
nixos/graphite: limit amount of log message defaults
2013-10-28 17:09:53 +01:00
Jaka Hudoklin
0229f45cf3
nixos/graphite: graphite requires pidfile set for startup
2013-10-28 17:08:33 +01:00
Michael Raskin
3022fff7db
Adding Quantum Minigolf game
2013-10-28 00:09:46 +04:00
Eelco Dolstra
f79a7359b0
firebird.nix: Fix a misplaced } that causes "users" to be outside "config"
2013-10-25 15:52:52 +02:00
Eelco Dolstra
20150b1cee
Ensure that the manual job gets build with the right revision info
2013-10-24 19:58:34 +02:00
Eelco Dolstra
d49f141a79
Manual: When building from the channel, link to the exact Git revision
2013-10-24 02:03:10 +02:00
Eelco Dolstra
a3777ba4f9
Remove dependencies on the Nixpkgs location
2013-10-23 20:08:23 +02:00
Domen Kožar
03e1178f80
munin: fix documentation links
2013-10-23 13:54:46 +02:00
Domen Kožar
897329fc47
Merge pull request #1106 from ocharles/redshift
...
services.redshift: New service
2013-10-22 01:33:08 -07:00
Oliver Charles
d792544802
services.redshift: New service
2013-10-22 09:03:06 +01:00
Marc Weber
6cb91c33d0
Firebird service:
...
* simplify directory layout
* clean up option descriptions
* let the user override Firebird package
* create firebird user
* clarify TODO comment
Close # 1061.
2013-10-21 20:33:11 +03:00
Evgeny Egorochkin
d2f612b1b6
postgresql.authMethod: remove unimplemented option.
...
close #1104 .
2013-10-21 19:26:26 +03:00
Evgeny Egorochkin
4732f59226
xserver.s3tcSupport: fix typo, improve description.
2013-10-21 19:11:17 +03:00
Eelco Dolstra
65277727e8
nix-gc: Revert to "script" instead of ExecStart
...
There is an assumption that cfg.options can contain shell code, so
ExecStart doesn't work here.
2013-10-21 11:22:27 +02:00
Jaka Hudoklin
c7429711b8
nixos/nginx: allow to specify which package to use
...
This enables to override which plugins to include with nginx by allowing to change
nginx package. I also removed webdav option in nginx nixos module, because you
can now specify this by overriding nginx package.
2013-10-20 22:52:02 +02:00
Domen Kožar
aeff0028bf
munin: add test and fix a bug
2013-10-20 21:16:24 +02:00
Michael Raskin
f88aa22706
Allow non-SSL connections to vsftpd by default to let tests not specify certificate
2013-10-20 21:16:12 +04:00
Michael Raskin
a0bbc3e838
Add apparently missing option to vsftpd configuration
2013-10-20 20:39:37 +04:00
Michael Raskin
9b6f7c14ec
Merge pull request #1060 from MarcWeber/submit/vsftpd
...
small vsftpd improvements
2013-10-20 08:58:21 -07:00
Domen Kožar
c1b9775821
Merge pull request #1090 from NixOS/munin-rework
...
munin: refactor package and add nixos service
2013-10-20 08:10:28 -07:00
Domen Kožar
9230ae6522
munin: refactor package and add nixos service
2013-10-20 15:08:07 +02:00
Rok Garbas
af0e2ccf45
zope2 service... indentation fix
2013-10-20 01:35:09 +02:00
Evgeny Egorochkin
89854548e7
Add services.xserver.s3tcSupport option
2013-10-19 00:40:45 +03:00
Eelco Dolstra
ad0568e64a
mkEnableOption: Add a period at the end of the description
2013-10-17 14:29:51 +02:00
Eelco Dolstra
82ad8c5ce0
Make manual generation not depend on the user's configuration
...
Previously changing the value of certain options in configuration.nix
would cause the manual to be regenerated, because some option defaults
depend on the configuration. This is undesirable because rebuilding
the manual is kind of slow. So now the manual reflects an empty
configuration.
The downside is that this requires another call to fixMergeModules,
which adds about 14% to evaluation time. Probably worth it.
2013-10-17 13:43:40 +02:00
Shea Levy
a5a13c4e43
Add gurobi token server service
...
Not yet tested, I don't have a license yet
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-16 11:02:05 -04:00
Eelco Dolstra
e0db0aaa4d
Rename /etc/nix.machines to /etc/nix/machines
...
Since we have a /etc/nix directory, we should use it and not pollute
/etc.
2013-10-16 10:57:25 +02:00
Eelco Dolstra
16cd8b039b
Remove nix.manualNixMachines
...
Suggested by Marc Weber. Fixes #1059 .
Generate /etc/nix.machines only if buildMachines is not empty. Thus,
if you want to manage /etc/nix.machines in some other way, you can set
nix.distributedBuilds to true but not set nix.buildMachines.
2013-10-16 10:53:23 +02:00
Eelco Dolstra
7c7bfa817a
fail2ban: Update to 0.8.10
...
Also fix random start failures due to a race between the fail2ban
server and the postStart script.
2013-10-16 10:03:43 +02:00
Domen Kožar
c9acee7ee0
Merge pull request #1073 from offlinehacker/nixos/graphite/fix_carbon
...
nixos/graphite: carbon, use syslog for logging
2013-10-15 14:59:51 -07:00
Eelco Dolstra
bbe265e8c2
slim: Only enable if the X server is enabled
...
http://hydra.nixos.org/build/6494972
Disabling slim revealed that services.xserver.displayManager.job had
an incorrect type, so fixed that as well.
2013-10-15 17:24:33 +02:00
Eelco Dolstra
ae74b0ae58
sshd: Remove the usePAM option
...
Sshd *must* use PAM because we depend on it for proper session
management. The original goal of this option (disabling password
logins) can also be implemented by removing pam_auth authentication
from sshd's PAM service.
2013-10-15 15:05:49 +02:00
Eelco Dolstra
a2c820c678
Turn security.pam.services into an attribute set
...
That is, you can say
security.pam.services.sshd = { options... };
instead of
security.pam.services = [ { name = "sshd"; options... } ];
making it easier to override PAM settings from other modules.
2013-10-15 14:47:51 +02:00
Eelco Dolstra
3f2c0bf9bd
slim: Fix session handling
2013-10-15 13:41:03 +02:00
Eelco Dolstra
5b702be29f
Add support for slimlock, slim's simple screen locker
2013-10-15 13:23:40 +02:00
Eelco Dolstra
873662b8ad
slim: Work around broken PAM session handling
...
Previously logging in via SLiM more than once didn't work because SLiM
doesn't clean up its PAM session properly (that is, in a child rather
than in the parent). Thus the slim process becomes part of the user
session's cgroup, among other things. This patch causes SLiM to exit
after the session has finished, after which systemd will restart
display-manager.service.
Fixes NixOS/nixops#137 .
2013-10-15 13:23:40 +02:00
Jaka Hudoklin
63539b2844
nixos/graphite: carbon, use syslog for logging
...
Twisted provides option to log with syslog, this enables nicer logging.
Imagine what happens in a case of exception. If logs are written to stdout,
traceback won't be merged thus giving ugly logs. This commit fixes that.
This is also one of the official ways of starting carbon, so no worries.
2013-10-13 23:18:22 +02:00
Domen Kožar
e28ddcfbec
Merge pull request #1063 from offlinehacker/nixos/graphite/listen_defaults_fix
...
nixos: graphite, listen on localhost by default
2013-10-12 12:23:34 -07:00
Domen Kožar
a8dd839c1f
Merge pull request #1067 from offlinehacker/nixos/statsd/mgmt_ip_port
...
nixos/statsd: Add support to specify managment ip/port
2013-10-12 12:23:11 -07:00
Jaka Hudoklin
fd0d2872a4
nixos/elasticsearch: change loglevel from DEBUG to INFO
2013-10-12 12:43:33 +02:00
Jaka Hudoklin
285f447c49
nixos/statsd: Add support to specify managment ip/port
2013-10-12 12:37:52 +02:00
Jaka Hudoklin
677ecf4868
nixos/graphite: listen on localhost by default
2013-10-12 12:34:26 +02:00
Marc Weber
4683774277
experimental/vsftpd
...
vsftpd improvements:
- intorduce one declarative list of options
- make docummentation strings more understandable and add missing options
such as SSL/TLS support
- Use environment.etc."vsftpd".text because I can't think about any
reason why a shell script should be used.
That code was written in 2009.
2013-10-12 01:05:13 +02:00
Eelco Dolstra
5c1f8cbc70
Move all of NixOS to nixos/ in preparation of the repository merge
2013-10-10 13:28:20 +02:00