Graham Christensen
d51b522a6e
Merge pull request #64052 from aanderse/tomcat-connector
...
nixos/httpd: drop tomcat-connector httpd subservice
2019-07-19 15:25:44 -04:00
worldofpeace
00eef848b2
nixos/doc: fix build
...
Adjusts to options renamed in 90b1197301
2019-07-18 20:40:24 -04:00
worldofpeace
3531a229d1
nixos/pantheon: add gtk xdg desktop portal
2019-07-18 20:03:12 -04:00
worldofpeace
69f2836c1b
Merge pull request #64575 from pasqui23/portal
...
nixos/xdg: add portal option
2019-07-18 20:00:09 -04:00
Pasquale
90b1197301
nixos/xdg: add portal option
...
This factors the configuration out of the flatpak module.
2019-07-18 19:59:07 -04:00
Peter Simons
c768e1ff48
Merge pull request #64794 from peti/t/postfix-module
...
nixos: add 'localRecipients' config option for Postfix
2019-07-18 19:14:36 +02:00
fuwa
562b5061a7
nixos/tor: fix obfs4 package
2019-07-19 04:11:17 +08:00
Florian Klink
9d339e3b45
Merge pull request #61312 from Yarny0/tsm-client
...
TSM client
2019-07-18 02:46:31 +02:00
Robin Gloster
0972409c95
Merge pull request #64550 from bgamari/gitlab-12.0
...
gitlab: 11.10.8 -> 12.0.3
2019-07-17 16:01:03 +00:00
Jamey Sharp
d4e5748c1b
nixos/openldap: fix assertion
...
In commit d43dc68db3
, @Mic92 split the
rootpw option to allow specifying it in a file kept outside the Nix
store, as an alternative to specifying the password directly in the
config.
Prior to that, rootpw's type was `str`, but in order to allow both
alternatives, it had to become `nullOr str` with a default of `null`. So
I can see why this assertion, that either rootpw or rootpwFile are
specified, makes sense to add here.
However, these options aren't used if the configDir option is set, so as
written this assertion breaks valid configurations, including the
configuration used by nixos/tests/ldap.nix.
So this patch fixes the assertion so that it doesn't fire if configDir
is set.
2019-07-17 11:08:10 +03:00
Nikolay Amiantov
294751a4fc
Merge pull request #62955 from abbradar/resolvconf
...
resolvconf service: init
2019-07-17 11:07:12 +03:00
Vladimír Čunát
2b28e4c96f
Merge #64892 : 'staging-next' (another iteration)
...
It's not completely without regressions, but I believe we can deal with
the rest directly on master. This is required for Firefox security fixes.
2019-07-16 19:32:17 +02:00
Frederik Rietdijk
a28a9ac156
Merge master into staging-next
2019-07-16 11:15:46 +02:00
Danylo Hlynskyi
475f1ebd98
Merge branch 'master' into postgresql-plugins-bin
2019-07-16 11:32:52 +03:00
Robin Gloster
52fd300b8c
gitlab module: fix permissions
2019-07-16 03:51:17 +02:00
Robin Gloster
3469c206f2
gitlab-shell: better gitlab_shell_secret location
...
So this won't be cleaned up by removing config/*
2019-07-16 03:51:11 +02:00
Robin Gloster
783c2f6106
gitlab module: clean up permission handling
...
This is WIP to get rid of PermissionsStartOnly=true
2019-07-16 01:19:07 +02:00
Nikolay Amiantov
01b90dce78
resolvconf service: init
...
This is a refactor of how resolvconf is managed on NixOS. We split it
into a separate service which is enabled internally depending on whether
we want /etc/resolv.conf to be managed by it. Various services now take
advantage of those configuration options.
We also now use systemd instead of activation scripts to update
resolv.conf.
NetworkManager now uses the right option for rc-manager DNS
automatically, so the configuration option shouldn't be exposed.
2019-07-15 20:25:39 +03:00
WilliButz
a9ce5f6c59
nixos/grafana: add grafana user to group 'grafana'
2019-07-15 18:33:19 +02:00
Peter Simons
59bacaca3d
nixos: add 'localRecipients' config option for Postfix
...
The new option services.postfix.localRecipients allows
configuring the postfix option 'local_recipient_maps'. When
set to a list of user names (or patterns), that map
effectively replaces the lookup in the system's user
database that's used by default to determine which local
users are valid.
This option is useful to explicitly set local users that are
allowed to receive e-mail from the outside world. For local
injection i.e. via the 'sendmail' command this option has no
effect.
2019-07-15 17:36:20 +02:00
Yarny0
d99462ff5a
nixos/backup/tsm: init module
...
Based on the programs/tsm-client module,
this commit introduces a systemd service that uses the
tsm-client to create regular backups of the machine.
2019-07-15 09:41:37 +02:00
Vladimír Čunát
3686036e02
Merge branch 'master' into staging-next
...
Hydra nixpkgs: ?compare=1530372
2019-07-15 09:39:03 +02:00
Silvan Mosberger
5eac339829
nixos/redmine: add database.createLocally option ( #63932 )
...
nixos/redmine: add database.createLocally option
2019-07-14 16:22:37 +02:00
Nikolay Amiantov
8951505dc9
Merge pull request #62956 from abbradar/nm-fixes
...
NetworkManager fixes
2019-07-13 22:31:13 +03:00
José Romildo Malaquias
c3282487dd
xfce4-13: rename to xfce4-14
2019-07-13 08:42:05 -03:00
caadar
6fea6dbc00
manual: mention jmacs as emacs imitation
2019-07-13 11:01:17 +02:00
Frederik Rietdijk
54065ae20d
Merge master into staging-next
2019-07-13 09:45:40 +02:00
Silvan Mosberger
5b8b5a694c
Merge pull request #64112 from davidtwco/deluge/users-groups-firewalls
...
nixos/deluge: add user/group/openFirewall opts and extraction packages to path
2019-07-12 20:26:55 +02:00
Florian Klink
a234b91271
Merge pull request #64621 from gloaming/dhcpcd-before-network-online
...
nixos/dhcpcd: Before network-online.target
2019-07-12 12:48:01 +02:00
Aaron Andersen
c13fbe0551
Merge pull request #63844 from aanderse/zabbix-cleanup
...
nixos/zabbix: overhaul package & module
2019-07-12 06:12:51 -04:00
Vladimír Čunát
2c3f18721e
Merge #59924 : knot-resolver: 3.2.1 -> 4.1.0 (security)
2019-07-12 09:14:53 +02:00
Aaron Andersen
08286b4f29
nixos/httpd: drop tomcat-connector httpd subservice
2019-07-11 20:58:55 -04:00
Aaron Andersen
649ec93c37
foswiki: drop package & httpd subservice
2019-07-11 19:46:30 -04:00
Aaron Andersen
6a1de5460b
nixos/httpd: remove broken trac subservice
2019-07-11 19:19:27 -04:00
Aaron Andersen
4191c80c31
nixos/zabbixProxy: init module
2019-07-11 18:55:58 -04:00
Aaron Andersen
70092c9acb
nixos/zabbixAgent & nixos/zabbixServer: various module updates
2019-07-11 18:54:15 -04:00
Aaron Andersen
6891fb4103
nixos/zabbixWeb: replace httpd subservice with new module
2019-07-11 18:45:46 -04:00
Matthew Bauer
99c04c74cf
Merge pull request #63581 from PsyanticY/zabbix-4.0
...
zabbix:1.8 -> 4.0 | remove old packages
2019-07-11 15:05:05 -04:00
worldofpeace
a6ce6c1052
Merge pull request #61981 from ambrop72/no-opengl-ld-library-path
...
nixos: Don't set LD_LIBRARY_PATH for graphics drivers that don't need it.
2019-07-11 13:15:51 -04:00
PsyanticY
16f8a17416
zabbix:1.8 -> 4.0 | remove old packages
2019-07-11 17:22:26 +01:00
Nikolay Amiantov
48b3e70534
Update nixos/modules/services/networking/networkmanager.nix
...
Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
2019-07-11 18:37:51 +03:00
Craig Hall
2ae58dfc79
nixos/dhcpcd: Before network-online.target
...
Instead of network.target. Fixes #60900 (delayed boot).
2019-07-11 12:23:41 +01:00
Frederik Rietdijk
22cb7f25f2
Merge master into staging-next
2019-07-11 09:40:10 +02:00
Edmund Wu
7d95bc0c85
nixos/libinput: use types.lines
for additionalOptions
2019-07-10 12:22:57 -04:00
Vladimír Čunát
9efdd2e434
knot-resolver: 3.2.1 -> 4.0.0
...
https://lists.nic.cz/pipermail/knot-resolver-users/2019/000136.html
Similar commit worked fine for me, including the nixos service.
I'd like to still improve the service to support easy passing of sockets
to http module.
2019-07-10 17:40:04 +02:00
Frederik Rietdijk
da96a4119f
Merge staging-next into staging
2019-07-10 08:52:50 +02:00
Frederik Rietdijk
fb6260fcf7
Merge pull request #64236 from NixOS/staging-next
...
Staging next
2019-07-10 08:52:04 +02:00
Austin Seipp
acb1134074
nixos/foundationdb: s/pidFile/pidfile/
...
Fixes an evaluation regression introduced by a case-typo in
de6e5ea815
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2019-07-09 17:11:31 -05:00
Aaron Andersen
ca336ac985
Merge pull request #64050 from aanderse/mercurial
...
nixos/httpd: drop mercurial httpd subservice
2019-07-09 12:54:01 -04:00
Frederik Rietdijk
79a03641d5
Merge staging-next into staging
2019-07-09 15:46:26 +02:00