Robin Gloster
08893722ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 08:23:17 +00:00
Robert Klotzner
e361cdd5c3
nixos: libinput use mkEnableOption
2016-02-27 07:24:47 +01:00
Thomas Tuegel
639c6b91a9
ibus: add engine list to module description
2016-02-26 18:43:54 -06:00
Thomas Tuegel
2383a708f6
ibus: refresh cache at startup
2016-02-26 18:43:41 -06:00
Thomas Tuegel
272cf5c44f
Merge branch 'ibus'
2016-02-26 18:10:11 -06:00
Thomas Tuegel
d30a128467
ibus: rewrite NixOS module
2016-02-26 18:08:48 -06:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Arseniy Seroka
766ad682f1
Merge pull request #13471 from Profpatsch/networkmanager-link-local
...
networkmanager: fix link-local ip addresses
2016-02-27 02:55:31 +03:00
zimbatm
2c7e5a6d8e
Merge pull request #13434 from spacefrogg/oath-module
...
config.security.oath: new module
2016-02-26 18:06:28 +00:00
Nikolay Amiantov
c88a06a860
cups service: set path for cups-genppdupdate
2016-02-26 18:27:41 +03:00
zimbatm
8d4c2340d3
Merge pull request #13396 from mayflower/pkg/gitlab
...
gitlab: 8.0.5 -> 8.5.1, service improvements
2016-02-26 11:19:28 +00:00
zimbatm
c86e10c115
Merge pull request #13469 from tg-x/acme-external
...
simp_le: external_pem.sh plugin is now called external.sh
2016-02-26 10:48:55 +00:00
Franz Pletz
cd0f14f23e
gitlab: Add documentation
...
Fixes #13303 .
2016-02-26 08:56:39 +01:00
Franz Pletz
e9393bd426
fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
...
Make the gitlab packages and components overrideable.
2016-02-26 08:56:08 +01:00
Franz Pletz
44a4592a1c
fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
...
gitlab-shell is now talking over the unix socket to gitlab, so the TCP
port isn't needed anymore.
2016-02-26 08:31:20 +01:00
Franz Pletz
3fd51a9ab2
fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
...
Some debugging and development leftovers.
2016-02-26 07:08:31 +01:00
Franz Pletz
bcfa59bf82
gitlab: 8.0.5 -> 8.5.0, service improvements
...
Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.
Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.
Things to note:
* The gitlab config is now written as a nix attribute set and will be
converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
The `extraConfig` opition is also an attribute set that will be merged
with the default config. This way *all* Gitlab options are supported.
* Some paths like uploads and configs are hardcoded in rails (at least
after my study of the Gitlab source). This is why they are linked from
the Gitlab root to /run/gitlab and then linked to the configurable
`statePath`.
* Backup & restore should work out of the box from another Gitlab instance.
* gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
Push & pull over HTTPS works perfectly. Communication to gitlab is done
over unix sockets. An HTTP server is required to proxy requests to
gitlab-workhorse over another unix socket at
`/run/gitlab/gitlab-workhorse.socket`.
* The user & group running gitlab are now configurable. These can even be
changed for live instances.
* The initial email address & password of the root user can be configured.
Fixes #8598 .
2016-02-26 07:08:31 +01:00
Profpatsch
70c02402c8
networkmanager: fix link-local ip addresses
...
NetworkManager needs an additional avahi-user to use link-local
IPv4 (and probably IPv6) addresses. avahi-autoipd also needs to be
patched to the right path.
2016-02-26 03:28:56 +01:00
Tanner Doshier
4e5ef470a7
ec2-data: ensure providing a SSH host key is actually optional
...
2701665904
broke this.
2016-02-25 20:11:49 -06:00
zimbatm
b73c5ae291
Merge pull request #10546 from aszlig/nixops-issue-350
...
Fixes for NixOps issue #350
2016-02-26 00:33:49 +00:00
tg(x)
629a89343e
simp_le: external_pem.sh plugin is now called external.sh
2016-02-26 01:31:58 +01:00
zimbatm
76f5cf3f31
Merge pull request #13324 from zimbatm/doc-from-wiki
...
Converting the wiki to documentation
2016-02-25 19:37:43 +00:00
zimbatm
dc314aad12
samba module: add more description
...
Fixes #13281
2016-02-25 19:36:55 +00:00
zimbatm
93a0306e79
sane module: add more documentation
...
Imported from https://nixos.org/wiki/Scanners
2016-02-25 19:36:46 +00:00
Michael Raitza
d09c7986de
config.security.oath: new module
...
Add a module to make options to pam_oath module configurable.
These are:
- enable - enable the OATH pam module
- window - number of OTPs to check
- digits - length of the OTP (adds support for two-factor auth)
- usersFile - filename to store OATH credentials in
2016-02-25 13:52:45 +00:00
Emery
b16dc8dcc5
New hdapsd module
2016-02-24 21:51:13 +01:00
Jordan Mulcahey
a2b8cc0aaf
netatalk: 3.1.0 -> 3.1.7, new service module
2016-02-24 19:32:54 +01:00
Eelco Dolstra
e2af876c78
Merge pull request #13415 from MatrixAI/master
...
nixos/stage-1/2: Added -r option to read so that read interprets backslashes literally
2016-02-24 13:50:59 +01:00
Brian McKenna
7d91ee54c9
openbox: fix copy/paste typo in config
2016-02-24 22:54:08 +11:00
Roger Qiu
5cf823e1f4
nixos/stage-1/2: Added -r option to read so that read interprets backslashes literally, and corrected the comment about optional logging.
2016-02-24 18:54:25 +11:00
zimbatm
2a0f6453d5
Merge pull request #12540 from eskimor/libinput-master
...
nixos: Libinput: Add support like there is for synaptics
2016-02-24 00:01:38 +00:00
zimbatm
cfa99e5a99
Merge pull request #13114 from colemickens/azure
...
azure: package qemu 2.2.0 to fix VHD creation
2016-02-23 22:47:44 +00:00
zimbatm
55ca9eb477
Merge pull request #13115 from colemickens/azure-agent
...
azure-agent: switch back to upstream WALinuxAgent
2016-02-23 22:46:30 +00:00
zimbatm
09c14170d8
Merge pull request #13125 from abbradar/uwsgi
...
Refactor uWSGI
2016-02-23 22:32:54 +00:00
Eelco Dolstra
d9d6a92d5e
sshd.nix: Ensure global config goes before user Match blocks
...
Hopefully fixes #13393 .
2016-02-23 18:03:33 +01:00
Eelco Dolstra
cacf2d063e
Merge pull request #13059 from abbradar/udev-local-priority
...
Make local udev rules higher prioritized
2016-02-23 16:41:47 +01:00
Nikolay Amiantov
32df5ed4c2
udev service: make local rules apply after all others
2016-02-23 15:17:24 +03:00
Eelco Dolstra
deae4eff7b
Make stage-1/2 logging unconditional, and drop log level to "debug"
...
Using "debug" level prevents spamming the console with messages twice
(once directly and once via kmsg).
2016-02-23 11:56:09 +01:00
Eelco Dolstra
6f6e2c430f
test-instrumentation.nix: Only clear $PAGER in the backdoor shell
2016-02-23 11:56:09 +01:00
Eelco Dolstra
806b27a297
qemu-guest.nix: Disable rngd
...
This gets rid of a zillion "rngd[N]: read error" messages during boot.
2016-02-23 11:56:09 +01:00
Roger Qiu
474d5a7bd0
nixos/stage-2: Added boot.logCommands
2016-02-23 11:56:09 +01:00
Roger Qiu
142f65e07a
nixos/stage-1: Added boot.initrd.logCommands
2016-02-23 11:56:08 +01:00
Pascal Wittmann
5d6d841d58
Merge pull request #13373 from tomberek/revert_kippo_twisted
...
kippo: revert twisted dependency
2016-02-22 23:50:17 +01:00
Thomas Bereknyei
e31c8922e0
kippo: revert twisted dependency
2016-02-22 13:57:24 -05:00
Franz Pletz
2d5e6a27fc
Merge pull request #13355 from grahamc/ttyNumberString-issue3608
...
nixos-manual: Accept numbers for ttyNumber, closes #3608
2016-02-22 19:34:16 +01:00
Graham Christensen
f57c049e0b
nixos-manual: Accept numbers for ttyNumber, closes #3608
2016-02-22 11:25:16 -06:00
Sou Bunnbu
7fcecec58b
Merge pull request #11254 from ericsagnes/standardize-im
...
Improve and standardize input methods
2016-02-22 10:13:54 +08:00
Robin Gloster
4036e9ba8c
Merge branch 'up' into hardened-stdenv
2016-02-20 22:27:33 +00:00
zimbatm
a7715e3e06
Merge pull request #10231 from zimbatm/apache-intermediate-ssl
...
apache-httpd: adopt mozilla's SSL configuration recommendation
2016-02-20 19:14:51 +00:00
Robin Gloster
686c09dd38
wpa_supplicant module: after network-interfaces.target
...
fixes #13136
2016-02-20 17:41:02 +00:00