3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

1990 commits

Author SHA1 Message Date
Domen Kožar 2d681fdcf7 Merge pull request #12202 from thoughtpolice/nixos/tarsnap/sep-cachedirs
nixos: tarsnap - allow and document concurrent backups
2016-01-17 12:48:59 +01:00
Sander van der Burg 4fafd77f7e disnix: propagate ejabberd username to the activation module 2016-01-16 18:08:07 +00:00
Alexander V. Nikolaev de8dea4821 nixos: add module for rmilter 2016-01-16 15:12:30 +02:00
Alexander V. Nikolaev 14926f08a3 nixos: Add module for rspamd 2016-01-16 15:11:36 +02:00
aszlig 7e36514c90
nixos/postfix: Set type for extraConfig to "lines"
Regression introduced by 3891d3e654.

Merging multiple options with type "str" won't work and give an
evaluation error. For extra configuration lines in the Postfix config it
really should be "lines", especially because even the description
mentions "extra lines".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-01-15 17:57:09 +01:00
roblabla 7e10bf4327 matrix-synapse: init at 0.12.0 2016-01-15 15:17:14 +01:00
Mark Laws e7ba7fba01 gale: init at 1.1happy 2016-01-13 12:00:50 -08:00
Nikolay Amiantov b292e19fbd xserver service: wait for systemd-logind
This seems the right thing to do, and most likely has fixed the race condition
described at https://github.com/NixOS/nixpkgs/issues/12132#issuecomment-171284532
2016-01-13 17:31:23 +03:00
Peter Simons ae6fc4c5be Merge pull request #12293 from abbradar/postfix-updates
Rework postfix module and package
2016-01-13 14:12:50 +01:00
Vladimír Čunát 3bcf8ae879 nixos manuals: bring back package references
This reverts most of 89e983786a, as those references are sanitized now.
Fixes #10039, at least most of it.

The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
2016-01-13 12:04:31 +01:00
Nikolay Amiantov b4179c5612 nixos/dspam: add module 2016-01-13 13:08:55 +03:00
Nikolay Amiantov f5efac09aa nixos/opendkim: add module 2016-01-13 13:07:46 +03:00
Nikolay Amiantov c51d08cf27 nixos/postsrsd: add module 2016-01-13 13:04:12 +03:00
Sander van der Burg 23772ef0a2 ejabberd: make config parameter nullable, so that the default bundled config can be used if none is given 2016-01-12 17:12:47 +00:00
Nikolay Amiantov d3a19f1b8e nixos/postfix: backwards compatibility with /var/postfix 2016-01-12 18:01:27 +03:00
Nikolay Amiantov 1edb62b40a nixos/postfix: add options to compile additional maps and aliases 2016-01-12 18:00:54 +03:00
Nikolay Amiantov 9c502abb1c nixos/postfix: use path instead of direct package mentions 2016-01-12 17:56:54 +03:00
Nikolay Amiantov 902dd35d47 nixos/postfix: move scripts to serviceConfig 2016-01-12 17:54:44 +03:00
Nikolay Amiantov ef3102b27e nixos/postfix: move /var/postfix to /var/lib/postfix, fix access rights 2016-01-12 17:54:41 +03:00
Sander van der Burg b1d6e6a38b Fix running apache tomcat as a daemon 2016-01-12 14:32:22 +00:00
Nikolay Amiantov 54bc19270b nixos/postfix: add users and groups only if needed, fix group name 2016-01-12 16:41:35 +03:00
Nikolay Amiantov 22fb0cb058 nixos/postfix: don't emit alias_maps config option if we don't have aliases set 2016-01-12 16:41:34 +03:00
Tobias Geerinckx-Rice 521f903b80 xorgVideoUnichrome: remove dead package
Broken since 2013, upstream very dead.
2016-01-11 00:16:01 +01:00
goibhniu 8b8f864e48 Merge pull request #12103 from rick68/ostinato
Ostinato
2016-01-11 00:09:32 +01:00
Aristid Breitkreuz 01eea878ad Merge pull request #12291 from abbradar/ejabberd
Update ejabberd, new NixOS module for it
2016-01-10 21:15:33 +01:00
Aristid Breitkreuz 9c92faf370 Merge pull request #12133 from dwe11er/new-package/irqbalance
irqbalance: init at 1.1.0
2016-01-10 21:06:50 +01:00
Aristid Breitkreuz bca9ecdd05 Merge pull request #12238 from bfrog/postgresql95
postgresql: 9.4 -> 9.5
2016-01-10 21:01:19 +01:00
Nikolay Amiantov d0510febe1 nixos/ejabberd: update service 2016-01-10 21:28:27 +03:00
Nikolay Amiantov 3891d3e654 nixos/postfix: add types 2016-01-10 06:07:38 +03:00
Arseniy Seroka c03fe79265 Merge pull request #10996 from oxij/nixos-label
nixos: introduce system.nixosLabel support
2016-01-09 20:52:08 +03:00
Jan Malakhovski 119c8f91e7 nixos: introduce system.nixosLabel option and use it where appropriate
Setting nixosVersion to something custom is useful for meaningful GRUB
menus and /nix/store paths, but actuallly changing it rebulids the
whole system path (because of `nixos-version` script and manual
pages). Also, changing it is not a particularly good idea because you
can then be differentitated from other NixOS users by a lot of
programs that read /etc/os-release.

This patch introduces an alternative option that does all you want
from nixosVersion, but rebuilds only the very top system level and
/etc while using your label in the names of system /nix/store paths,
GRUB and other boot loaders' menus, getty greetings and so on.
2016-01-08 22:26:15 +00:00
Thomas Tuegel fdefc0cb2c Merge branch 'kdenetwork-filesharing' 2016-01-08 14:20:46 -06:00
Thomas Tuegel 049357bb30 nixos/kde5: install kio-extras 2016-01-08 14:20:07 -06:00
Thomas Tuegel fa0057be39 nixos/kde5: install kdenetwork-filesharing if Samba enabled 2016-01-08 14:20:05 -06:00
Tom Burdick 2c23a311cd postgresql: (94 -> 95)
Updates postgresql to its latest versions
2016-01-08 10:13:01 -06:00
Marcin Falkiewicz 7636359c89 irqbalance: init at 1.1.0 2016-01-08 12:37:43 +01:00
Nathan Zadoks 8cb22c0a63 consul service: add package option 2016-01-08 01:44:28 +01:00
Shea Levy 4a511911bb Merge branch 'rm-notbit' of git://github.com/jgillich/nixpkgs 2016-01-07 14:34:40 -05:00
Daniel Peebles 57cb5ab17a Merge pull request #12198 from mayflower/remove-upstart-layer
Remove upstart layer
2016-01-07 13:47:39 -05:00
Austin Seipp 7a01badef5 nixos: tarsnap - allow keys for individual archives
Two concurrent tarsnap backups cannot be run at the same time with the
same keys - completely separate sets of keys must be generated for each
archive in this case, if you want backups to overlap.

This extends the archives attrset to support a 'keyfile' option, which
defaults to /root/tarsnap.key like the top-level attribute.

With this change, if you generate two keys with tarsnap-keygen(1) and
use each of those separately for each archive, you can backup
concurrently.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-01-07 05:54:41 -06:00
Austin Seipp ec70f64ecd nixos: tarsnap - separate archive cachedirs
Tarsnap locks the cachedir during backup, meaning if you specify
multiple backups with a shared cache that might overlap (for example,
one backup may take an hour), secondary backups will fail. This isn't
very nice behavior for the obvious reasons.

This splits the cache dirs for each archive appropriately. Note that
this will require a rebuild of your archive caches (although if you were
only using one archive for your whole system, you can just move the
directory).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-01-07 05:54:36 -06:00
Tanner Doshier ad796f155b nixos: tarsnap - make systemd timer persistent
A machine may not always be active (or online!) when a backup timer
triggers, meaning backups can be missed - now we properly set the
tarsnap timer's Persistent option so systemd will run the command even
when the machine wasn't online at that exact time.

However, we also need to make sure that we can contact the tarsnap
server reliably before we start the backup. So, we attempt to ping the
access endpoint in a loop with a sleep, before continuing.

This fixes #8823.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-01-07 05:52:18 -06:00
Peter Simons a68450e509 Merge pull request #12009 from mayflower/tinc-module
tinc module: Ed25519PrivateKeyFile, BindToAddress
2016-01-07 12:48:35 +01:00
Austin Seipp 472a5192fd Revert "nixos: tarsnap - separate archive cachedirs"
This reverts commit 5f0253ace6.

I didn't intend to push this - I meant to push it to *my fork's*
remote...
2016-01-07 04:51:58 -06:00
Austin Seipp 5f0253ace6 nixos: tarsnap - separate archive cachedirs
Tarsnap locks the cachedir during backup, meaning if you specify
multiple backups with a shared cache that might overlap (for example,
one backup may take an hour), secondary backups will fail. This isn't
very nice behavior for the obvious reasons.

This splits the cache dirs for each archive appropriately. Note that
this will require a rebuild of your archive caches (although if you were
only using one archive for your whole system, you can just move the
directory).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-01-07 04:26:57 -06:00
Austin Seipp 4dc7cab40e nixos: btsync - switch to using systemd user services
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-01-07 03:33:38 -06:00
Tristan Helmich 1a0d004cc2 tinc module: Ed25519PrivateKeyFile, listenAddress 2016-01-07 09:13:28 +00:00
Robin Gloster 88292fdf09 jobs -> systemd.services 2016-01-07 06:39:06 +00:00
Robin Gloster af50b03f50 fuppes: remove obsolete broken package and service 2016-01-07 06:39:05 +00:00
Austin Seipp d89454bb79 nixos: btsync - add directoryRoot option
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-01-07 00:09:20 -06:00
Jakob Gillich 57d6dfe932 notbit: removed dead package
The Bitmessage protocol v3 became mandatory on 16 Nov 2014 and notbit does not support it, nor has there been any activity in the project repository since then.
2016-01-07 04:39:51 +01:00
Robin Gloster 246f0e91cd wpa_supplicant service: Warn about plaintext keys in docs 2016-01-06 03:58:39 +00:00
Robin Gloster 609457458e wpa_supplicant module: remove preStart hack
If the config file is managed imperatively we shouldn't touch it.
2016-01-06 03:58:39 +00:00
Robin Gloster d03b35f881 wpa_supplicant module: add networks option 2016-01-06 03:58:39 +00:00
Robin Gloster 3a5f488445 wpa_supplicant module: refactor 2016-01-06 03:58:39 +00:00
Robin Gloster 7d973a56d0 wpa_supplicant module: remove obsolete option
networking.WLANInterface has been obsolete for years
2016-01-06 03:58:39 +00:00
Peter Simons 49d18bdfcb Revert "Basic Declaritive Network Configuration in wpa_supplicant Service" 2016-01-05 19:32:41 +01:00
Peter Simons d807b057ed Merge pull request #11920 from bjornfor/rename-host-to-listen-address
Rename NixOS option names: 'host' to 'listenAddress'
2016-01-05 12:54:15 +01:00
Peter Simons f4b2c3d510 Merge pull request #12155 from vkleen/postfix-configuration-options
Postfix configuration options
2016-01-05 12:32:23 +01:00
Eelco Dolstra 22848d55e2 kdmrc: Build locally 2016-01-05 12:17:32 +01:00
Viktor Kleen ebd8e2c380 postfix service: include configuration option for transport maps 2016-01-05 02:59:16 -08:00
Viktor Kleen 8fad959b15 postfix service: make SMTP services optional using enableSmtp option 2016-01-05 02:57:52 -08:00
Peter Simons 94e6323de0 Merge pull request #12015 from mayflower/wpa_supplicant-service
Basic Declaritive Network Configuration in wpa_supplicant Service
2016-01-05 10:53:13 +01:00
Tobias Geerinckx-Rice a133ef9a0c liferea, graphite service: fix typo (agregator -> aggregator) 2016-01-05 01:03:50 +01:00
Svein Ove Aas f16594e18b nixos/fail2ban: Enable jails by default
With jails defaulting to 'enabled = true', the sshd jail that NixOS
defines will now be enabled.

[Bjørn: tweak commit message]
2016-01-04 21:52:32 +01:00
Wei-Ming Yang bd035405f4 ostinato: add ostinato in NixOS services 2016-01-04 14:29:02 +08:00
Shea Levy 06356c90dc Merge branch 'kmscon-extraoptions' of git://github.com/nathan7/nixpkgs 2016-01-03 10:01:43 -05:00
Tobias Geerinckx-Rice 99075fb402 saneBackends{,Git} -> sane-backends{,-git}
Fixes xsane evaluation.
2016-01-03 03:31:38 +01:00
Arseniy Seroka 1d2accb8fe Merge pull request #9716 from benley/mathics-service
Add a Mathics notebook service (with test)
2016-01-03 01:37:06 +03:00
Benjamin Staffin fe8498f609 nixos/mathics: New service and test 2016-01-02 14:34:55 -08:00
Nathan Zadoks d396f1e99b kmscon service: add extraOptions option 2016-01-02 22:21:54 +01:00
Domen Kožar 8225e1b1c1 Merge pull request #12086 from bmorphism/master
thinkfan levels option to control actuation points
2016-01-02 10:56:37 +01:00
Barton Yadlowski d732a7f5c5 thinkfan levels option to control actuation points 2016-01-02 04:49:58 -05:00
Austin Seipp 59acfd4f16 nixos/plex: Add 'package' option to module
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-12-30 20:20:25 -06:00
Domen Kožar f41603d8a6 Merge pull request #11940 from jgillich/dnsmasq-leases
dnsmasq: create state dir for dhcp leases file
2015-12-30 16:50:14 +01:00
Emery 952563d620 WindowLab: initial pkg at 1.40
http://nickgravgaard.com/windowlab/
2015-12-30 11:10:30 +01:00
Robin Gloster 4bf7afc78e wpa_supplicant module: remove preStart hack
If the config file is managed imperatively we shouldn't touch it.
2015-12-29 18:49:39 +00:00
Robin Gloster 56a53ff458 wpa_supplicant module: add networks option 2015-12-29 18:49:39 +00:00
Robin Gloster 9dceabc95d wpa_supplicant module: refactor 2015-12-29 18:49:39 +00:00
Robin Gloster 57210ce1c1 wpa_supplicant module: remove obsolete option
networking.WLANInterface has been obsolete for years
2015-12-29 18:49:38 +00:00
Domen Kožar fe9a7c6d5b Merge pull request #11956 from zimbatm/nm-openvpn-uid-gid
networkmanager: set uid/gid for the networkmanager openvpn agent
2015-12-27 11:02:55 +01:00
Jakob Gillich ae4a7f9351 hostapd: rename extraCfg -> extraConfig, added asserts 2015-12-26 11:37:00 +01:00
Vladimír Čunát 5a2f0541a1 nixos/xserver: fix evaluation of xkbDir
I solved it this way because it seems the current state-of-the-art 89e983786
The problem was introduced in #11930. Close #11951 (a different solution).
2015-12-26 09:09:15 +01:00
Arseniy Seroka 7e14e28a80 Merge pull request #11870 from lancelotsix/improve_slurm_service
Improve slurm service configuration
2015-12-25 18:36:18 +03:00
Lancelot SIX ca4c354789 slurm service: improve config 2015-12-25 15:54:35 +01:00
Jakob Gillich a193ea3700 dnsmasq: create state dir for dhcp leases file
ref #11718
2015-12-24 22:36:19 +01:00
Reno Reckling 92e48a4383 xserver: make xkbdir configurable 2015-12-24 13:45:27 +01:00
Tobias Geerinckx-Rice 09c8911bd7 redshift: don't busy-loop like crazy on NixOS start-up 2015-12-24 04:05:57 +01:00
Bjørn Forsman c7c3c95d92 nixos/kibana: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:28:27 +01:00
Bjørn Forsman 7334ecd41a nixos/elasticsearch: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:28:09 +01:00
Bjørn Forsman 46924e77a2 nixos/sslh: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:23:51 +01:00
Bjørn Forsman 6c2fc3a5ac nixos/shout: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:22:47 +01:00
Bjørn Forsman 19aed49163 nixos/statsd: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:20:56 +01:00
Bjørn Forsman 8b9f3c8c35 nixos/graphite: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:20:39 +01:00
Bjørn Forsman 38ca880612 nixos/cadvisor: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:14:40 +01:00
Bjørn Forsman 6b10df7eaa nixos/subsonic: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:13:15 +01:00
Bjørn Forsman e0b0b9723c nixos/docker-registry: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:06:40 +01:00
Bjørn Forsman 79367816a9 nixos/mpd: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:04:04 +01:00
Bjørn Forsman 873a9202f6 nixos/neo4j: rename 'host' to 'listenAddress'
More descriptive option name.
2015-12-24 00:01:02 +01:00
Bjørn Forsman b2d0886b37 nixos/jenkins: fix typo in docstring (s/adress/address/) 2015-12-23 23:49:01 +01:00