JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,460 Commits 2 Branches 0 Tags 13 GiB
7b768ba2f5
Commit Graph

1119 Commits

Author SHA1 Message Date
Alex Berg
7b768ba2f5 Merge remote-tracking branch 'nixos/master' into feature/add-znc-module 
Conflicts:
	nixos/modules/misc/ids.nix
 2014-07-03 11:30:11 -05:00
lethalman
cb86818789 Merge pull request #3079 from wmertens/patch-4 
virtualbox: Fix permissions for /dev/vboxdrvu
 2014-07-03 15:05:05 +02:00
Shea Levy
b3cfb9084b Get all lib functions from lib, not pkgs.lib, in modules 2014-07-02 12:28:18 -04:00
Luca Bruno
cb41fecaa1 Try fixing the nixos mumble tests, again 2014-07-02 11:28:43 +02:00
Eelco Dolstra
b8cb960a58 Fix evaluation 2014-07-01 16:28:34 +02:00
Jaka Hudoklin
16f801cba9 nixos/pam: make pam_loginuid optional if in container 2014-06-30 11:08:39 +02:00
Michael Raskin
77314b7eb2 Merge pull request #2888 from nilcons/no-random-arch-downgrades 
Fix nixos-rebuild.sh to depend on Nix
 2014-06-30 12:47:17 +04:00
Michael Raskin
02266194ea Merge pull request #2894 from kirelagin/fixusergroup 
Fix conditional handling of users and groups in some services
 2014-06-30 10:16:20 +04:00
Michael Raskin
b403893aa2 Merge pull request #2778 from edwtjo/radicale 
Adding Radicale package and service
 2014-06-30 10:11:23 +04:00
Michael Raskin
f2e9ebbd46 Merge pull request #2283 from wizeman/u/sysctl-merge 
nixos: Fix sysctl option merging
 2014-06-30 09:03:33 +04:00
Florian Friesdorf
9b7dbcc83e name nixos tests, close #3078 2014-06-28 16:05:47 +02:00
Florian Friesdorf
6a3e6164bd support for nixos test names 2014-06-28 16:05:03 +02:00
aszlig
622673495b
nixos/log2html: Remove schema from jQuery URLs. 
This allows viewing test logs for example when using a Hydra running
with HTTPS.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-27 09:41:11 +02:00
aszlig
da32f052b1
Revert "nixos/sshd: drop mode from auth keys file". 
This reverts commit a3331eb87b.

See https://github.com/NixOS/nixpkgs/issues/2559#issuecomment-47313334
for a description why this is not a good idea.

I guess it's better to implement a sane way to remove all files in
authorized_keys.d, especially because it is also backwards-compatible.

Reopens #2559.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-27 09:22:07 +02:00
aszlig
865787ef32
nixos/tests/openssh: Test configured auth keys. 
So far the test only uses an authorized key that is copied over to the
target machine instead of being set by the target's configuration.

Now, we cover both cases.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-27 08:52:03 +02:00
John Wiegley
8eedf968eb Merge pull request #3093 from lethalman/sshkeys 
nixos/sshd: drop mode from auth keys file. Closes #2559
 2014-06-26 10:26:47 -07:00
Luca Bruno
a3331eb87b nixos/sshd: drop mode from auth keys file. Closes #2559 2014-06-26 10:15:34 +02:00
Austin Seipp
13162e8cdb Fix gitolite docs 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:55:43 -05:00
Austin Seipp
3eb2d1e03e nixos: add gitolite module 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-25 22:54:18 -05:00
Alex Berg
9af1e2ab51 Add ZNC module. Has zncConfOptions or specify full conf file. 2014-06-26 05:44:32 +02:00
Jan Malakhovski
37c7d024ef nixos: change EDITOR and PAGER environment variables to mkDefaults 
Signed-off-by: Domen Kožar <domen@dev.si>
 2014-06-25 17:07:10 +02:00
wmertens
147fd1ff12 virtualbox: Fix permissions for /dev/vboxdrvu 
See https://bugs.archlinux.org/task/38314 and https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Installer/linux/installer-common.sh?rev=47894#L28
 2014-06-25 15:52:05 +02:00
Bjørn Forsman
4def9a762f nixos: add some missing '.' in option descriptions 2014-06-24 21:25:11 +02:00
Bjørn Forsman
f78ce19d8c nixos/elasticsearch: capitalize systemd service description 2014-06-24 21:11:12 +02:00
Bjørn Forsman
6ce8f753e0 nixos/elasticsearch: add '.' at end of description strings 
Nixos option descriptions should be full sentences, ending in a full
stop. (Package descriptions, on the other hand, should not.)
 2014-06-24 21:06:30 +02:00
lethalman
6d006a9cca Merge pull request #3005 from offlinehacker/nixos/logstash/enableWeb 
nixos/logstash: add enableWeb option to enable kibana web interface
 2014-06-24 12:42:26 +02:00
Rickard Nilsson
9ff0b303ff elasticsearch: Add option specifying extra command line options 2014-06-24 11:01:28 +02:00
Rickard Nilsson
94deea2035 nixos: Add option hardware.sane.configDir 2014-06-24 10:52:12 +02:00
Austin Seipp
0399c5ee24 grsecurity: update stable/testing kernels, refactoring 
This updates the new stable kernel to 3.14, and the new testing kernel
to 3.15.

This also removes the vserver kernel, since it's probably not nearly as
used.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-22 22:29:10 -05:00
Bjørn Forsman
76672dd9e3 accountsservice: be consistent in naming (always two 's') 
The package is (correctly) named 'accountsservice' (with two 's'), but
the attribute and expression path lacked one 's'. Fix it.
 2014-06-22 21:32:16 +02:00
Cillian de Róiste
74cd7cb3c8 sane: environment.variables -> environment.sessionVariables 
See 13befa3979 for details
 2014-06-22 14:38:45 +02:00
Austin Seipp
6cfa38ce7d nagios: significant upgrades 
- Upgrade Nagios Core to 4.x
 - Expose mainConfigFile and cgiConfigFile in module for finer
   configuration control.
 - Upgrade Plugins to 2.x
 - Remove default objectDefs, which users probably want to customize.
 - Systemd-ify Nagios module and simplify directory structure
 - Upgrade Nagios package with more modern patch, and ensure the
   statedir is set to /var/lib/nagios

Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-22 00:22:10 -05:00
Paul Colomiets
11e25f1a3e Implement per-user socket units 2014-06-20 17:41:14 -04:00
Rob Vermaas
04e648f789 Change size of Amazon EC2 S3-backed images to 8GB (was 4GB). 
(cherry picked from commit 05543ef6e038a834aa323d467c9ef02ad99c5adb)
 2014-06-19 11:28:06 +02:00
Rob Vermaas
fe3a63b7d0 EC2: allow building S3-backed HVM ami's 
(cherry picked from commit e007559e9580c134f43ea9dc2279ff41cb3bd015)
 2014-06-19 10:57:26 +02:00
aszlig
3e64126344
nixos/shadow: Add an example for defaultUserShell. 
Thanks to @devhell for the suggestion.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-06-19 01:51:33 +02:00
Austin Seipp
15aee28fa1 Merge pull request #2990 from third3ye/patch-3 
Minor logic fix
 2014-06-18 16:16:58 -05:00
Austin Seipp
e5023b1f45 Merge pull request #2974 from bluescreen303/samba 
samba really requires its daemons
 2014-06-18 16:15:50 -05:00
Austin Seipp
4eb7fdcc13 Merge pull request #2966 from wkennington/master.sudo 
Update and fix sudo
 2014-06-18 16:13:53 -05:00
Austin Seipp
91f1dda340 Merge pull request #2980 from bluescreen303/php-fpm 
phpfpm: add option for setting php.ini file
 2014-06-18 16:08:21 -05:00
Jaka Hudoklin
db8de47ce7 nixos/logstash: add enableWeb option to enable kibana web interface 2014-06-18 13:37:13 +02:00
William A. Kennington III
ef4ea24420 sudo: Always keepVisudo in order to simplify sudo build 2014-06-17 22:41:32 -05:00
Anders Claesson
97d65d8010 nixos manual: fix typo (close #2997) 2014-06-17 21:52:22 +02:00
William A. Kennington III
86711e4120 nixos-iso: Re-enable new kernel iso images (close #2839) 2014-06-17 21:23:52 +02:00
Ricardo M. Correia
f8e108c865 nixos.tests.installer: Fix test failures due to network being disabled 2014-06-17 18:41:26 +02:00
third3ye
9c83a6bc76 Minor logic fix 
music_directory     "${cfg.musicDirectory}"
playlist_directory  "${cfg.dataDir}/playlists"
db_file             "${cfg.dataDir}/tag_cache"
state_file          "${cfg.dataDir}/state"
sticker_file        "${cfg.dataDir}/sticker.sql"

all refer to ${cfg.datadir}, which by default is "/var/lib/mpd/". 

Parsing for instance ${cfg.datadir}/playlists results in:
/var/lib/mpd//playlists - NOT FOUND.
 2014-06-17 03:24:39 +00:00
Mathijs Kwik
464739c391 samba really requires its daemons 2014-06-16 22:44:27 +02:00
Mathijs Kwik
35df71ac1d phpfpm: add option for setting php.ini file 2014-06-16 22:44:18 +02:00
Mathijs Kwik
a97bef3e8c nixos/nginx: fix group and stateDir permissions 
furthermore, I don't think adding nginx to systemPackages is of any use.
 2014-06-16 22:43:58 +02:00
Eelco Dolstra
9ae3654fd6 Fix generation of synergy-{client,server} when disabled 2014-06-16 10:45:09 -04:00