3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3086 commits

Author SHA1 Message Date
pennae 9547123258 nixos/*: convert internal option descriptions to MD
we'll have to do it eventually, may as well be now.
2022-08-31 16:32:54 +02:00
pennae ef176dcf7e nixos/*: automatically convert option descriptions
conversions were done using https://github.com/pennae/nix-doc-munge
using (probably) rev f34e145 running

    nix-doc-munge nixos/**/*.nix
    nix-doc-munge --import nixos/**/*.nix

the tool ensures that only changes that could affect the generated
manual *but don't* are committed, other changes require manual review
and are discarded.
2022-08-31 16:32:53 +02:00
pennae 5a643387ec nixos/*: normalize more docbook for auto-conversion 2022-08-31 16:32:53 +02:00
pennae e4f876eb7e nixos/*: convert varlist-using options to MD
there are sufficiently few variable list around, and they are
sufficiently simple, that it doesn't seem helpful to add another
markdown extension for them. rendering differences are small, except in
the tor module: admonitions inside other blocks cannot be made to work
well with mistune (and likely most other markdown processors), so those
had to be shuffled a bit. we also lose paragraph breaks in the list
items due to how we have to render from markdown to docbook, but once we
remove docbook from the pipeline those paragraph breaks will be restored.
2022-08-31 16:32:53 +02:00
pennae c915b915b5 nixos/*: md-convert options with unordered lists
mostly no rendering changes. some lists (like simplelist) don't have an
exact translation to markdown, so we use a comma-separated list of
literals instead.
2022-08-31 16:32:53 +02:00
pennae 1013069f52 nixos/*: convert more partially-md option descriptions
this mostly means marking options that use markdown already
appropriately and making a few adjustments so they still render
correctly. notable for nftables we have to transform the md links
because the manpage would not render them correctly otherwise.
2022-08-31 16:32:14 +02:00
pennae 7d102d113a nixos/*: convert multiline inline code to listings
presumably it was not intended to have these blocks rendered inline, and
markdown conversion would be messy as well.
2022-08-31 16:27:25 +02:00
pennae 0cfcb5908c nixos/*: <screen> -> <programlisting>
most of the screen tags used in option docs are actually listings of
some sort. nsd had a notable exception where its screen usage was pretty
much a raw markdown block that made most sense to convert into docbook lists.
2022-08-31 16:27:24 +02:00
Netali 52e621ace8
nixos/kea: fix ctrl-agent extraArgs 2022-08-31 01:26:12 +02:00
Martin Weinelt f3b7d6414b
Merge pull request #128192 from clerie/keepalived-secrets 2022-08-29 23:44:34 +02:00
iko 4bc69a5235
nixos/searx: improve searxng compatibility 2022-08-28 16:52:42 +03:00
KFears 7f22740983 nixos/syncthing: fix path setting for versioning
Syncthing config XML uses `fsPath` setting for specifying the path to the versioning folder. This commit adds `services.syncthing.folders.<name>.versioning.fsPath` option to enable this functionality declaratively. Previously, `versioning.params.versionsPath` was used, which doesn't work.
2022-08-28 17:27:51 +04:00
pennae 5a20c87970 nixos/vsftpd: convert option descriptions to MD
no change to rendered output.
2022-08-27 19:18:29 +02:00
pennae 51a11254a7 nixos/*: literalDocBook -> literalMD
no change to rendered output
2022-08-27 19:18:29 +02:00
pennae a2ceee8ffe nixos/strongswan: convert to MD descriptions
no changes to the manpage output. the html output changes, but only by
whitespace.
2022-08-27 19:18:29 +02:00
clerie bf7d05e64d nixos/keepalived: add secrets support 2022-08-27 17:19:16 +02:00
misuzu 5fcdceb0b2 nixos/netbird: init 2022-08-22 16:37:43 +03:00
Guillaume Girol e941a9d433
Merge pull request #186652 from peterhoeg/u/http-dns
nixos/https-dns-proxy: bump version and add support for OpenDNS
2022-08-20 18:09:23 +00:00
pennae 6039648c50 nixos/*: automatically convert option docs 2022-08-19 22:40:58 +02:00
pennae 7e7d68a250 nixos/*: mark pre-existing markdown descriptions as mdDoc 2022-08-19 22:40:58 +02:00
pennae b51f8036c2 nixos/*: use properly indented strings for option docs
using regular strings works well for docbook because docbook is not as
whitespace-sensitive as markdown. markdown would render all of these as
code blocks when given the chance.
2022-08-19 22:40:58 +02:00
pennae 72b507d5a2 nixos/*: convert some markdown in docbook to tags
a lot of markdown syntax has already snuck into option docs, many of it
predating the intent to migrate to markdown. we don't convert all of it
here, just that which is accompanied by docbook tags as well. the rest
can be converted by simply adding the mdDoc marker.
2022-08-19 22:40:58 +02:00
pennae e4ed177f82 nixos/* eliminate inner whitespace in tags that was missed earlier
nix-doc-munge won't match tags that contain newlines anywhere. most of
these have already been removed, but a few obviously made it through.
2022-08-19 22:40:58 +02:00
pennae 8f8e101527 nixos/*: normalize <package> to <literal>
this renders the same in the manpage and a little more clearly in the
html manual. in the manpage there continues to be no distinction from
regular text, the html manual gets code-type markup (which was probably
the intention for most of these uses anyway).
2022-08-19 22:40:58 +02:00
Peter Hoeg 28116cfd9b nixos/https-dns-proxy: add OpenDNS support 2022-08-17 10:25:31 +08:00
Jörg Thalheim 66c94cd524
Merge pull request #185856 from NoneTirex/fix-headscale-tls-config
headscale: fix tls challengeType enum possible values
2022-08-15 17:51:49 +01:00
Christian Kögler 0884cb0ba2
Merge pull request #177577 from jmbaur/globalprotect-openconnect_config
nixos/globalprotect: add settings option for service configuration
2022-08-15 14:43:13 +02:00
pennae 50f9b3107a
Merge pull request #185474 from pennae/option-docs-md
nixos/*: more options md conversion
2022-08-12 23:23:26 +02:00
Martin Weinelt a58668f0a0
Merge pull request #176835 from pennae/syncserver 2022-08-12 01:33:26 +02:00
pennae bd1978e911 nixos/firefox-syncserver: init 2022-08-12 00:45:25 +02:00
Emery Hemingway 300c5c98c6 nixos/yggdrasil: rename "config" option to "settings"
Make this service consistent with rfc42.

https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md
2022-08-11 16:09:42 -05:00
Jörg Thalheim 8ccf4e05df nixos/consul: use signal instead of api for reload
consul might require authentication if acls are enabled for `consul
reload` to work. Signals never require authentication.
2022-08-11 13:32:47 +02:00
tirex 8f9ef1c30e headscale: fix tls challengeType enum possible values 2022-08-10 03:09:41 +02:00
Moritz 'e1mo' Fromm 79ae88a100
nixos/syncthing: Add receiveencrypted folder type
This folder type is available in syncthing, but could not be set in
NixOS.
See <https://docs.syncthing.net/users/untrusted.html> for reference.
2022-08-09 15:03:14 +02:00
Michael Adler d8b356caaf fix: ssh-keygen fails if directory does not exist 2022-08-09 12:16:17 +02:00
pennae 087472b1e5 nixos/*: automatically convert option docs 2022-08-06 20:39:12 +02:00
Emery Hemingway c0eaefb30c nixos/yggdrasil: want/before systemd's network.target 2022-08-06 07:25:15 -05:00
pennae 423545fe48 nixos/*: normalize manpage references to single-line form
now nix-doc-munge will not introduce whitespace changes when it replaces
manpage references with the MD equivalent.

no change to the manpage, changes to the HTML manual are whitespace only.
2022-08-05 18:34:50 +02:00
pennae 93c57a9884
Merge pull request #185056 from pennae/option-docs-md
nixos/*: more option docs conversions
2022-08-05 17:36:49 +02:00
olaf de0c734300 for consistency use bob in example instead of joe 2022-08-05 13:13:24 +02:00
pennae 61e93df189 nixos/*: automatically convert option docs to MD
once again using nix-doc-munge (69d080323a)
2022-08-03 22:46:41 +02:00
pennae 3aebb4a2be nixos/*: normalize link format
make (almost) all links appear on only a single line, with no
unnecessary whitespace, using double quotes for attributes. this lets us
automatically convert them to markdown easily.

the few remaining links are extremely long link in a gnome module, we'll
come back to those at a later date.
2022-08-03 21:57:46 +02:00
pennae 9c8531c8a5 nixos/*: replace <replaceable>s with «thing»
we can't embed syntactic annotations of this kind in markdown code
blocks without yet another extension. replaceable is rare enough to make
this not much worth it, so we'll go with «thing» instead. the module
system already uses this format for its placeholder names in attrsOf
paths.
2022-08-03 21:08:58 +02:00
pennae 16102dce2f nixos/*: replace <code> in option docs with <literal>
markdown can't represent the difference without another extension and
both the html manual and the manpage render them the same, so keeping the
distinction is not very useful on its own. with the distinction removed
we can automatically convert many options that use <code> tags to markdown.

the manpage remains unchanged, html manual does not render
differently (but class names on code tags do change from "code" to "literal").
2022-08-03 21:03:23 +02:00
pennae 694d5b19d3 nixos/*: replace </para><para> with double linebreaks
our xslt already replaces double line breaks with a paragraph close and
reopen. not using explicit para tags lets nix-doc-munge convert more
descriptions losslessly.

only whitespace changes to generated documents, except for two
strongswan options gaining paragraph two breaks they arguably should've
had anyway.
2022-08-03 20:39:21 +02:00
Michele Guerini Rocco f909bfde79
Merge pull request #184248 from SuperSandro2000/SuperSandro2000-patch-1
nixos/ncdns: replace shortened link
2022-08-03 11:23:04 +02:00
Michael Auchter 5c0e18a6bb nixos/soju: add defaults and assertions for TLS
Enabling soju without providing a value for tlsCertificate currently
results in:

  error: The option `services.soju.tlsCertificate' is used but not
  defined.

Since tlsCertificate is intended to be optional, set default to null.

Additionally, add assertions to ensure that both tlsCertificate and
tlsCertificateKey are either set or unset.
2022-08-02 17:36:04 +00:00
pennae 6b13dd0e9e
Merge pull request #183491 from pennae/automatic-md-conversions
treewide: automatically md-convert option descriptions
2022-08-02 02:15:30 +02:00
Sandro be194e390f
nixos/ncdns: replace shortened link 2022-07-31 17:13:03 +02:00
Greizgh dd8386c453
nixos/seafile: version 9.0x compatibility 2022-07-30 18:29:33 +02:00
pennae 2e751c0772 treewide: automatically md-convert option descriptions
the conversion procedure is simple:

 - find all things that look like options, ie calls to either `mkOption`
   or `lib.mkOption` that take an attrset. remember the attrset as the
   option
 - for all options, find a `description` attribute who's value is not a
   call to `mdDoc` or `lib.mdDoc`
 - textually convert the entire value of the attribute to MD with a few
   simple regexes (the set from mdize-module.sh)
 - if the change produced a change in the manual output, discard
 - if the change kept the manual unchanged, add some text to the
   description to make sure we've actually found an option. if the
   manual changes this time, keep the converted description

this procedure converts 80% of nixos options to markdown. around 2000
options remain to be inspected, but most of those fail the "does not
change the manual output check": currently the MD conversion process
does not faithfully convert docbook tags like <code> and <package>, so
any option using such tags will not be converted at all.
2022-07-30 15:16:34 +02:00
Aaron Andersen 2aecc7fdc1
Merge pull request #183360 from Sohalt/nixos/headscale
nixos/headscale: minor improvements
2022-07-30 15:02:37 +02:00
Rick van Schijndel 9e9f6fc1c3
Merge pull request #152065 from chkno/stunnel-extraConfig
nixos/stunnel: Make free-form
2022-07-26 23:24:31 +02:00
Bernardo Meurer 1cfb6dab0f
Merge pull request #182789 from talyz/sshd-dont-delete-symlinks
sshd: Don't remove symlinks to host key files
2022-07-25 21:51:46 -07:00
Felix Buehler 17e93b090e services.murmur: add openFirewall option 2022-07-24 10:32:37 +02:00
Bjørn Forsman 65399c4742 nixos/syncthing: don't leak the secret API key in process listings 2022-07-23 13:59:11 +02:00
Sandro 98b4daa994
Merge pull request #181881 from SuperSandro2000/searx 2022-07-21 22:39:48 +02:00
talyz ddf8182d5b
sshd: Don't remove symlinks to host key files
If a host key file is a symlink pointing to an as of yet non-existent
file, we don't want to remove it, but instead follow the symlink and
create the file at that location.

See https://github.com/nix-community/impermanence/issues/101 for more
information on the issue the original behavior creates.
2022-07-21 19:15:04 +02:00
Maximilian Bosch 501bbad4ce
Merge pull request #182104 from mayflower/mail-exporter-secrets
nixos/prometheus-mail-exporter: support storing `passphrase` outside of the store, use umask when using envsubst
2022-07-20 20:42:14 +02:00
Maximilian Bosch 590e60d124
nixos/mxisd: umask to avoid accidental world-readability 2022-07-20 20:29:38 +02:00
Wei Tang b0a0087d53
nixos/flannel: upgrade to etcdv3 (#180315) 2022-07-19 16:09:42 +10:00
oaksoaj fc9e22fca1 yggdrasil: add group option back and remove systemd User= directive
The group configuration parameter allow to share access to yggdrasil
control socket with the users in the system. In the version we propose,
it is null by default so that only root can access the control socket,
but let user create their own group if they need.

Remove User= durective in systemd unit. Should a user with the specified
name already exist in the system, it would be used silently instead of a
dynamic user which could be a security concern.
2022-07-18 12:56:59 -05:00
oaksoaj 080774e28f yggdrasil: reenable DynamicUser
Since version 0.4 Yggdrasil works again using systemd's DynamicUser option.
This patch reenables it to improve security.

We tested this with both persistent and non-persistent keys. Everything
seems to work fine.
2022-07-18 12:56:59 -05:00
Maximilian Bosch 179688c7c8
Merge pull request #181377 from mayflower/mxisd-secrets
nixos/mxisd: allow passing secrets
2022-07-18 15:10:49 +02:00
Maximilian Bosch c2c82fbe43
nixos/mxisd: use a list for env file for mergeability 2022-07-18 13:47:09 +02:00
Sandro Jäckel 3920bb41f2
nixos/searx: improve searxng compatibility 2022-07-17 21:45:30 +02:00
Aaron Andersen 9b01242132
Merge pull request #131261 from bb2020/dlna
nixos/minidlna: convert to structural settings
2022-07-15 21:28:19 +02:00
Maximilian Bosch d54d70f166
nixos/mxisd: allow passing secrets
Suppose you want to provide a LDAP-based directory search to your
homeserver via a service-user with a bind-password. To make sure that
this doesn't end up in the Nix store, it's now possible to set a
substitute for the bindPassword like

    services.mxisd.extraConfig.ldap.connection = {
      # host, bindDn etc.
      bindPassword = "$LDAP_BIND_PW";
    };

and write the actual secret into an environment file that's readable for
`mxisd.service` containing

    LDAP_BIND_PW=<your secret bind pw>

and the following setting in the Nix expression:

    services.mxisd.environmentFile = "/runs/ecrets/mxisd";

(cherry picked from commit aa25ce7aa1a89618e4257fd46c7d20879f54c728)
2022-07-13 19:19:17 +02:00
Sandro 78fff7ed35
Merge pull request #181197 from bjornfor/fix-ddclient-password-leak 2022-07-12 15:13:43 +02:00
Bjørn Forsman e0f2f7f9ea nixos/ddclient: don't leak password in process listings
...by using `replace-secret` instead of `sed` when injecting the
password into the ddclient config file. (Verified with `execsnoop`.)

Ref https://github.com/NixOS/nixpkgs/issues/156400.
2022-07-12 10:23:40 +02:00
Pascal Wittmann 6d1cabe9d9
Merge pull request #158346 from kurnevsky/i2pd-yggdrasil
i2pd: add yggdrasil settings
2022-07-12 10:19:18 +02:00
Sandro 366683965e
Merge pull request #166308 from ncfavier/wg-resolvconf
nixos/resolvconf: allow different implementations
2022-07-10 21:00:00 +02:00
James Hannah c6e76ab7c9 nixos/radvd: add package option
Allow package users to override the package for radvd.
2022-07-01 21:11:46 +02:00
Sandro 911a73340c
Merge pull request #175335 from wyndon/init-lokinet 2022-07-01 11:54:38 +02:00
bb2020 7113eb5574 nixos/minidlna: convert to structural settings 2022-07-01 11:05:38 +03:00
bb2020 449d6ce32b nixos/minidlna: add more configuration options 2022-07-01 11:05:38 +03:00
wyndon 69e1e00ebb
nixos/lokinet: init 2022-06-30 16:01:50 +02:00
Pascal Bach 13df7151e1
Merge pull request #178783 from greizgh/fix-syncthing-doc
nixos/syncthing: fix services.syncthing.folders description
2022-06-27 22:37:56 +02:00
Aaron Andersen 28562b800e
Merge pull request #178154 from aanderse/nixos/prosody
nixos/prosody: conditionally provision required directories with StateDirectory
2022-06-26 22:45:18 +02:00
Sandro 74ea995b11
Merge pull request #174446 from jsimonetti/routedns-init
routedns: init at 0.1.5
2022-06-24 16:31:03 +02:00
Lassulus 8c2e25e98e
Merge pull request #177081 from azahi/trickster
trickster: 0.1.10 -> 1.1.5
2022-06-23 22:24:54 +02:00
Greizgh ac1e34f0fe
nixos/syncthing: fix services.syncthing.folders description
It was improperly referencing overrideDevices instead of overrideFolders.
2022-06-23 20:44:59 +02:00
Bernardo Meurer 5332bc174a
Merge pull request #178483 from twitchyliquid64/tailscale-networkd
tailscale: ignore tailscale link when using networkd
2022-06-23 12:10:14 -04:00
ajs124 6c189d264e
Merge pull request #177077 from Lassulus/bitlbee_cfgdir
nixos/bitlbee: allow writing to configDir
2022-06-22 19:27:59 +02:00
Naïm Favier 4af5c46faa
nixos/dhcpcd: use networking.resolvconf.package
Allow using the appropriate resolver implementation to set DNS entries
(typically systemd-resolved instead of openresolv).
2022-06-21 22:58:44 +02:00
Naïm Favier 953a5bd3dd
nixos/tailscale: use networking.resolvconf.package
Allow using the appropriate resolver implementation to set DNS entries
(typically systemd-resolved instead of openresolv).
2022-06-21 22:58:44 +02:00
Naïm Favier 458ac47a1d
nixos/wg-quick: improve usage with systemd-networkd
Use `networking.resolvconf.package` to allow DNS entries to be set using
the system-wide resolver implementation instead of hardcoding systemd or
openresolv.

Extend the tests by adding DNS entries and making one of the peers use
systemd-networkd (hence systemd-resolved).

Also add a few `networkd`-specific settings.
2022-06-21 22:58:44 +02:00
Tom 3b8a162680 tailscale: ignore tailscale link when using networkd 2022-06-21 13:23:28 -07:00
Robert Hensing e2c261f2c0
Merge pull request #176146 from pennae/module-docs-markdown
treewide: markdown option docs
2022-06-21 13:16:02 +02:00
Aaron Andersen 078a53824e nixos/prosody: provide additional details in the user and group options description 2022-06-18 10:08:08 -04:00
Aaron Andersen 79bfd3c0d0 nixos/prosody: conditionally provision required directories with StateDirectory 2022-06-18 10:05:15 -04:00
Jeroen Simonetti 829167bd27
nixos/routedns: init
Signed-off-by: Jeroen Simonetti <jeroen@simonetti.nl>
2022-06-15 08:33:46 +02:00
Azat Bahawi 82497b0e9f
trickster: 0.1.10 -> 1.1.5 2022-06-14 01:51:45 +03:00
Jared Baur f880ea69ba
nixos/globalprotect: add settings option for service configuration 2022-06-13 15:29:41 -07:00
Maximilian Bosch fd2a89b983
nixos/wpa_supplicant: don't log that wpa_supplicant.conf is ignored with allowAuxiliaryImperativeNetworks = true
The warning is wrong with `allowAuxiliaryImperativeNetworks`[1] being
set to `true` because both files are included in this case with `-c` and
`-I`.

[1] https://nixos.org/manual/nixos/stable/options.html#opt-networking.wireless.allowAuxiliaryImperativeNetworks
2022-06-12 17:07:36 +02:00
pennae 320aa2a791 treewide: attempt at markdown option docs 2022-06-12 12:44:38 +02:00
Timothy DeHerrera ec4e23d4e9
Merge pull request #171155 from cab404/wg-quick-files
nixos/wg-quick: added support for configuration files
2022-06-11 22:00:45 -07:00
Soham Sen feff6ddbe7 expressvpn: init at 3.25.0.13 2022-06-11 17:10:33 +05:30
lassulus a12e525410 nixos/bitlbee: allow writing to configDir 2022-06-09 21:05:16 +02:00
sohalt f1669775bc nixos/headscale: do not run gin webframework in debug mode 2022-06-07 23:22:05 +02:00
sohalt 18c899d963 nixos/headscale: only set oidc secret if not null 2022-06-07 23:21:13 +02:00
cab 8de1e9e2f8
nixos/wg-quick: added support for configuration files 2022-06-07 01:28:50 +04:00
pennae e21c4d67d5 nixos/unifi: change deprecated default for openFirewall
this was deprecated 6 months ago in unstable for removal in 22.11,
so now seems like a good point to change the default.
2022-06-03 15:59:41 +02:00
Aaron Andersen 18a07645e5
Merge pull request #174959 from MoritzBoehme/openconnect-auto-start
nixos/openconnect: add autoStart option
2022-05-31 23:05:25 -04:00
Moritz Böhme 106bfcaf8a
nixos/openconnect: add autoStart option 2022-05-27 17:41:03 +02:00
Sandro 7fa8d8b2e2
Merge pull request #153481 from Tchekda/submit/bird-lg 2022-05-25 18:20:58 +02:00
pennae 023e25264c
Merge pull request #172983 from pennae/mosquitto-bind-interface
nixos/mosquitto: add bind_interface listener option, fix assertion messages
2022-05-23 10:53:08 +00:00
Martin Weinelt 05232d19b6
Merge pull request #163220 from fleaz/init-r53_ddns 2022-05-22 17:08:55 +02:00
Francesco Gazzetta 6bb9d0ce3b nixos/zeronet: fix systemd after 2022-05-21 17:46:28 -04:00
Francesco Gazzetta 183e391256 nixos/zeronet: add package option 2022-05-21 17:46:28 -04:00
David Tchekachev 0f63bd3ba8
nixos/bird-lg: init 2022-05-20 15:44:00 +03:00
Jörg Thalheim e56ae50ed9
Merge pull request #173109 from Mic92/upterm
nixos/upterm: additional hardening
2022-05-19 20:16:13 +01:00
Niklas Hambüchen 23aee34b6f
Merge pull request #171264 from NixOS/nebula-always-restart
nixos/nebula: Always restart
2022-05-19 14:05:49 +02:00
Anillc 6958412083
nixos/frr: add extraOptions option
Support passing options to daemons. For example, bgpd needs '-M rpki' to
enable rpki functions.
2022-05-19 16:02:47 +08:00
Silvan Mosberger 26ab617a10
Merge pull request #172393 from mweinelt/openssh/sntrup761x25519-sha512-kexmethod
nixos/openssh: Add sntrup761x25519-sha512 kexAlgo
2022-05-18 12:03:00 +02:00
Lassulus a976121d57
Merge pull request #165474 from jian-lin/fix-wireguard-systemd-unit-dependency
nixos/wireguard: fix dependencies on network-related targets
2022-05-18 11:16:25 +02:00
Robert Schütz ae758a85d7 nixos/radicale: give access to /dev/urandom
A git command was failing in the test with

    error: unable to get random bytes for temporary file: Operation not permitted
    error: unable to create temporary file: Operation not permitted
    error: .Radicale.lock: failed to insert into database
    error: unable to index file '.Radicale.lock'
2022-05-17 22:23:57 +02:00
github-actions[bot] f10256fb7a
Merge master into staging-next 2022-05-16 12:02:51 +00:00
Sandro 6c0dc6d621
nixos/ddclient: turn verbose off by default
verbose is a debugging setting one step noisier than debug and should only be turned on when debugging because it leaks quite some credentials and tokens in the journalctl.
2022-05-16 01:49:08 +02:00
pennae c1115d37ff nixos/mosquitto: fix attribute path display in assertions 2022-05-15 10:33:38 +02:00
pennae 2145dbc4fc nixos/mosquitto: add missing listener option bind_interface
we expose it under settings instead of at the listener toplevel because
mosquitto seems to pick the addresses it will listen on
nondeterministically from the set of addresses configured on the
interface being bound to. encouraging its use by putting it into the
toplevel options for a listener seems inadvisable.
2022-05-15 10:33:38 +02:00
Jörg Thalheim eefafb54ef
nixos/upterm: additional hardening
Before:
$ ps aux | grep upterm
root     2575046  0.0  0.0 1085080 6968 ?        Ssl  07:03   0:00 /nix/store/ci97r1lqx4128w75k7dcsw82j5bl0n3g-upterm-0.8.2/bin/uptermd --ssh-addr [::]:2323 --private-key ssh_host_ed25519_key

After
$ ps aux | grep upterm
uptermd  2832993  0.4  0.0 1158812 6856 ?        Ssl  07:08   0:00 /nix/store/ci97r1lqx4128w75k7dcsw82j5bl0n3g-upterm-0.8.2/bin/uptermd --ssh-addr [::]:2323 --private-key ssh_host_ed25519_key
2022-05-15 09:57:52 +02:00
github-actions[bot] bcb22e9a7b
Merge master into staging-next 2022-05-13 18:01:23 +00:00
Georg Haas 18ffb9690c
nixos/uptermd: init 2022-05-13 17:44:44 +02:00
Martin Weinelt fa7ce6bc7f
nixos/openssh: Add sntrup761x25519-sha512 kexAlgo
Introduced in OpenSSH 9.0 it became the part of the default kexAlgorithm
selection, visibile in sshd_config(5).

It is also enabled by default in the OpenSSH client, as can be seen from

$ ssh -Q KexAlgorithms

Also clarifies that we use the referenced documents as the lower bound,
given that they haven't been updated for 5-7y.
2022-05-10 23:20:54 +02:00
github-actions[bot] 27575e98ee
Merge staging-next into staging 2022-05-09 12:08:45 +00:00
Janne Heß e6fb1e63d1
Merge pull request #171650 from helsinki-systems/feat/config-systemd-package
treewide: pkgs.systemd -> config.systemd.package
2022-05-09 10:23:04 +02:00
github-actions[bot] 31938a3f5c
Merge staging-next into staging 2022-05-09 00:03:28 +00:00
Ivan Kozik 9db1d1782b nixos/tinc: unbreak the service
The user is actually tinc.${network}, as Mic92 points out in
https://github.com/NixOS/nixpkgs/pull/171703#discussion_r867506032

Sorry, I broke this in https://github.com/NixOS/nixpkgs/pull/171703 earlier.

coreutils 9.1 chown does not complain in this case with a valid dotted user.
2022-05-08 16:04:20 +00:00
github-actions[bot] 00e5877c2f
Merge staging-next into staging 2022-05-07 00:02:47 +00:00
Sandro d21ebc62bf
Merge pull request #170851 from danderson/danderson/ts-warn-rpf
nixos/tailscale: warn if strict reverse path filtering is in use.
2022-05-06 23:21:50 +02:00
github-actions[bot] ad713fb84e
Merge staging-next into staging 2022-05-06 12:02:39 +00:00
Yureka 96aaf29234
Revert "Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers"
This reverts commit 05417a66e7, reversing
changes made to 53e4f8d237.
2022-05-06 12:38:28 +02:00
github-actions[bot] 4c4d0d6bc3
Merge staging-next into staging 2022-05-06 06:02:20 +00:00
Rick van Schijndel 32bebf42ea
Merge pull request #171703 from ivan/chown-colon
treewide: chown user:group instead of user.group to fix warnings from coreutils 9.1
2022-05-06 07:20:40 +02:00
David Anderson 3fdac0f981 nixos/tailscale: warn if strict reverse path filtering is in use.
Tailscale uses policy routing to enable certain traffic to bypass
routes that lead into the Tailscale mesh. NixOS's reverse path
filtering setup doesn't understand the policy routing at play,
and so incorrectly interprets some of this traffic as spoofed.

Since this only breaks some features of Tailscale, merely warn
users about it, rather than make it a hard error.

Updates tailscale/tailscale#4432

Signed-off-by: David Anderson <dave@natulte.net>
2022-05-05 18:28:48 -07:00
Sandro b9e7f61c72
Merge pull request #171747 from danderson/danderson/tailscale-getent
nixos/tailscale: add glibc to PATH.
2022-05-06 03:10:00 +02:00
Sandro e5e30371bc
Merge pull request #170210 from danderson/danderson/restart-tailscaled
nixos/tailscale: use systemctl restart during activation.
2022-05-06 03:09:01 +02:00
David Anderson 67b1fac192 nixos/tailscale: add glibc to PATH.
For some features, tailscaled uses getent(1) to get the shell
of OS users. getent(1) is in the glibc derivation. Without this
derivation in the path, tailscale falls back to /bin/sh for all
users.

Signed-off-by: David Anderson <dave@natulte.net>
2022-05-05 17:09:27 -07:00
Ivan Kozik 59a76614f3 treewide: chown user:group instead of user.group to fix warnings from coreutils 9.1 2022-05-05 22:05:18 +00:00
Janne Heß 57cd07f3a9
treewide: pkgs.systemd -> config.systemd.package
This ensures there is only one systemd package when e.g. testing the
next systemd version.
2022-05-05 20:00:31 +02:00
LuoChen e4b942eccf wg-quick: fix postUp always generated issue 2022-05-05 16:08:46 +08:00
Daniel Fullmer ad38a2a646 nixos/ssh: remove empty host key files before generating new ones
In a previous PR [1], the conditional to generate a new host key file
was changed to also include the case when the file exists, but has zero
size. This could occur when the system is uncleanly powered off shortly
after first boot.

However, ssh-keygen prompts the user before overwriting a file. For
example:

$ touch hi
$ ssh-keygen -f hi
Generating public/private rsa key pair.
hi already exists.
Overwrite (y/n)?

So, lets just try to remove the empty file (if it exists) before running
ssh-keygen.

[1] https://github.com/NixOS/nixpkgs/pull/141258
2022-05-03 22:09:43 -07:00
fleaz 8b250ec5af
nixos/r53-ddns: init 2022-05-04 00:16:18 +02:00
Matthieu Coudron 5114d91cd8
Merge pull request #169802 from NinjaTrappeur/nin/prosody012 2022-05-03 11:04:17 +02:00
Niklas Hambüchen 73135fb85d
nixos/nebula: Always restart
Without this, if the network goes down for a while, systemd will give up after 5 restarts:

    Scheduled restart job, restart counter is at 5.
    Stopped Nebula VPN service for myvpn.
    nebula@myvpn.service: Start request repeated too quickly.
    Failed with result 'exit-code'.
    Failed to start Nebula VPN service for myvpn.

Most network services need this, but for VPNs it's extra important.
2022-05-02 16:45:44 +02:00
Félix Baylac-Jacqué 20693a1e73
prosody: 0.11.13 -> 0.12.0
See https://blog.prosody.im/prosody-0.12.0-released for more
informations.

We remove the various lua wrappers introduced by
6799a91843 and
16d0b4a69f. It seems like we don't need
them anymore. I'm not brave enough to dig into the Lua machinery to
see what resolved that. Sorry, you'll have to trust me on that one.

We should probably think about the migration from http_upload to
http_file_share for the NixOS module. It's not trivial, we need to
make sure we don't break the already uploaded URLs.
2022-05-02 12:43:19 +02:00
Lara 917be9fa32 asterisk: Create symlinks for each config individually
This commit refactors the way how configuration files are deployed to
the `/etc/asterisk` directory.

The current solution builds a Nix derivation containing all config files
and symlinks it to `/etc/asterisk`. The problem with that approach is
that it is not possible to provide additional configuration that should
not be written to the Nix store, i.e. files containing credentials.

The proposed solution changes the creation of configuration files so
that each configuration file gets symlinked to `/etc/asterisk`
individually so that it becomes possible to provide additional config
files to `/etc/asterisk` as well.
2022-05-02 10:32:34 +00:00
Bernardo Meurer ecfb5500f7
nixos/cloudflare-dyndns: init 2022-05-01 16:50:31 -07:00
Arnout Engelen 2b85441bb0
Merge pull request #146241 from rgrunbla/wpa_supplicant-fix-writable
wpa_supplicant: prevent writing non-writable configuration
2022-04-27 11:35:49 +02:00
David Anderson c9a1647ade nixos/tailscale: use systemctl restart during activation.
This avoids the scenario where you activate a new config over Tailscale,
and a long delay between the "stop services" and "start services" phases
of the activation script lead to your terminal freezing for tens of
seconds, until tailscaled finally gets started again and the session
recovers.

Per the documentation of stopIfChanged, this is only safe to do if the
service definition is robust to stopping the old process using the new
service definition. As the maintainer of the upstream systemd unit, I
can confirm that Tailscale is robust to this scenario: it has to be
in order to work right on several other distros that just do
unpack-then-restart, rather than the more complex stop-unpack-start
dance.

Signed-off-by: David Anderson <dave@natulte.net>
2022-04-24 23:31:35 -07:00
Jonas Heinrich 24b53785cc nixos/create_ap: add module 2022-04-23 07:17:44 -04:00
Jörg Thalheim aa446f8d3c
Merge pull request #169437 from Mic92/consul
nixos/consul: allow ipv6-only
2022-04-21 07:22:02 +01:00
Lassulus b424ce3fd2
Merge pull request #161587 from helsinki-systems/feat/bird2-reload-trigger
nixos/bird: reloadIfChanged -> reloadTriggers
2022-04-20 18:24:05 +01:00
Jörg Thalheim 325a525467
nixos/consul: allow ipv6-only 2022-04-20 17:32:06 +02:00
Alexandru Scvortov 4646491175 nixos/nbd: fix nbd-server config section ordering
Closes #169103
2022-04-18 17:28:09 +01:00
Artturi 063155ae92
Merge pull request #169106 from wahjava/fix-headscale-typo
headscale: Fix typo as per systemd.exec(5)
2022-04-18 02:19:15 +03:00
Madoura b18031c413
treewide/meta: Remove chiiruno and replace with Madouura (#169096)
* maintainers: remove chiiruno

* nixos/zeronet.nix: replace chiiruno with Madouura

* nixos/hydron: replace chiiruno with Madouura

* nixos/tests/bcachefs: replace chiiruno with Madouura

* lutris: replace chiiruno with Madouura

* qtchan: replace chiiruno with Madouura

* tinygo: replace chiiruno with Madouura

* vlang: replace chiiruno with Madouura

* merkletools: replace chiiruno with Madouura

* easyjson: replace chiiruno with Madouura

* quicktemplate: replace chiiruno with Madouura

* statik: replace chiiruno with Madouura

* dumb: replace chiiruno with Madouura

* sndio: replace chiiruno with Madouura

* hydron: replace chiiruno with Madouura

* edid-decode-unstable: replace chiiruno with Madouura

* tewisay: replace chiiruno with Madouura

* svt-av1: replace chiiruno with Madouura
2022-04-18 02:13:36 +03:00
Ashish SHUKLA 4a973081b3
headscale: Fix typo as per systemd.exec(5) 2022-04-18 02:00:29 +05:30
pennae 04b5d464ba
Merge pull request #169029 from LeSuisse/nixos-tailscale-cert-uid
nixos/tailscale: allow to set `TS_PERMIT_CERT_UID` env variable
2022-04-17 19:51:31 +00:00
Silvan Mosberger 4de6cbc904
Merge pull request #168551 from infinisil/syncplay-no-gui
syncplay: Allow disabling GUI
2022-04-17 19:05:29 +02:00
Thomas Gerbet f89894e2e3 nixos/tailscale: allow to set TS_PERMIT_CERT_UID env variable
This setting was introduced with Tailscale 1.22.0, see
https://github.com/tailscale/tailscale/releases/tag/v1.22.0

Co-authored-by: pennae <github@quasiparticle.net>
2022-04-17 12:13:24 +02:00
rnhmjoj d39a10daa8
nixos/ncdns: listen on IPv6 by default 2022-04-14 21:07:15 +02:00
rnhmjoj fd480f55df
nixos/pdns-recursor: update default values
1. Update the default values of several addresses-related settings
   that have been changed by upstream.

2. Make `dns.address` take multiple addresses. This is needed
   for dual stack, now working by default.
2022-04-14 17:31:16 +02:00
Silvan Mosberger bf123996f9 nixos/syncplay: Switch to version without GUI 2022-04-13 23:58:51 +02:00
Thiago Kenji Okada 3a570f57a1
Merge pull request #167775 from otavio/topic/improve-shellhub-module
nixos: shellhub-agent: support more options
2022-04-13 19:56:14 +01:00
pennae 3acf560427
Merge pull request #165883 from alyaeanyx/openconnect-module
nixos/openconnect: Add NixOS module for declarative OpenConnect VPNs
2022-04-10 21:30:26 +00:00
Otavio Salvador fcb69a8583 nixos/shellhub-agent: use package internally, avoiding it in PATH
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
Otavio Salvador d7a0f56c6a nixos/shellhub-agent: avoid code duplication for environment
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
Otavio Salvador bd3b046ac8 nixos/shellhub-agent: use mkPackageOption to simplify code
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
Otavio Salvador 8c4bc7f62c nixos/shellhub-agent: allow setting the preferredHostname
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-10 13:32:10 -03:00
alyaeanyx e4c93fb04c
nixos/openconnect: add hardening flags 2022-04-10 14:19:22 +02:00
Lassulus df7337ebb4
Merge pull request #166456 from mweinelt/isc-dhcp
dhcp: 4.4.2-P1 -> 4.4.3 and make client & relay support optional
2022-04-10 11:05:29 +01:00
Lassulus adc7fbbcdf
Merge pull request #164531 from jtojnar/networkmanager
nixos/networkmanager: Allow overriding installed plug-ins
2022-04-10 11:03:36 +01:00
Otavio Salvador 6729653309 nixos/shellhub-agent: allow setting the keepAliveInterval
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-09 20:11:12 -03:00
Otavio Salvador 60158bfc22 nixos/shellhub-agent: use new configuration variables
The old variables still work but will eventually stop to be supported so
move to the new ones.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-09 20:11:12 -03:00
Otavio Salvador a62471fc65 nixos/shellhub-agent: use mkEnableOption to simplify code
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-09 20:11:12 -03:00
Otavio Salvador 6175188591 nixos/shellhub-agent: reformat code using nixpkgs-fmt
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2022-04-08 19:23:23 -03:00
Sandro 45b9690a75
Merge pull request #147975 from andersk/mozillavpn 2022-04-08 15:32:45 +02:00
alyaeanyx 0c066f0d0e
nixos/openconnect: add module 2022-04-08 11:39:09 +02:00
pennae 3838b7e07e
Merge pull request #166894 from CameronNemo/nixos-mod-envoy
nixos/envoy: init
2022-04-07 16:23:12 +00:00
Cameron Nemo 1b4b16e1bd nixos/envoy: init 2022-04-07 14:43:53 +00:00
ajs124 821a184fa9 nixos/bird: reloadIfChanged -> reloadTriggers 2022-04-03 17:57:04 +01:00
Martin Weinelt eb40e8633a
Merge pull request #167027 from helsinki-systems/drop/broken 2022-04-03 18:29:26 +02:00
Martin Weinelt f2a00b4079
Merge pull request #163658 from dminuoso/kea-changes 2022-04-03 17:44:19 +02:00
Victor Nawothnig 799bda94db nixos/kea: Allow specifying custom config file 2022-04-03 17:34:00 +02:00
ajs124 eb13e249f0 openfire: remove after being marked broken for over two years
It was marked in commit 567c1a360f by Michael Raskin on 2017-01-04 (commited on 2017-01-04)
2022-04-03 16:14:18 +01:00
Artturi c7ac6ff789
Merge pull request #162063 from martinetd/logrotate_size
logrotate: update to freeform
2022-04-01 06:21:11 +03:00
Silvan Mosberger fda16bfd32
Merge pull request #165532 from Infinisil/syncplay-password 2022-04-01 04:37:22 +02:00
Dominique Martinet e92c05349c nixos/logrotate: convert to freeform
using freeform is the new standard way of using modules and should replace
extraConfig.
In particular, this will allow us to place a condition on mails
2022-04-01 07:09:26 +09:00
Martin Weinelt a31f123c1c
networkmanager: remove dhcp and pass dhcpcd instead
The ISC DHCP client has reached its end of life.
2022-03-30 21:05:10 +02:00
Jared Baur 41e2604483
nixos/dhcpd6: Use fixed-address6 for dhcpd6 address reservations 2022-03-29 07:58:42 -07:00
Martin Weinelt 999f3c2b9d
pdns: rename from powerdns
https://github.com/PowerDNS/pdns
https://repology.org/project/pdns/versions
2022-03-28 18:04:19 +02:00
Emery Hemingway ad15abe7ff squid: 4.17 -> 5.4.1
* enable HTCP
* enable systemd support
* add NixOS option "services.squid.package"
2022-03-25 15:59:05 +00:00
Peter Hoeg 39a6621150 nixos/https-dns-proxy: init module 2022-03-24 15:36:28 +08:00
Silvan Mosberger bc4631d8f0 nixos/syncplay: Add server password support 2022-03-24 04:46:26 +01:00
linj 0c795a8127 nixos/wireguard: fix dependencies on network-related targets
wireguard-${name}.service only sets up interfaces and doesn't need to
connect to the Internet.

See sections of these three network-related targets in systemd
manuals[1][2] for more information.

Also, remove the redundant multi-user.target in peer units.

Fixes #142152

[1]: https://www.freedesktop.org/software/systemd/man/systemd.special.html
[2]: https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
2022-03-23 18:23:35 +08:00
Sivizius b4c2ffaffa
nixos/wg-quick: add autostart option to interfaces (#162219)
This adds the option `networking.wg-quick.interfaces.<name>.autostart`, which defaults to `true`, which is the previous behavior. With this option set to `false`, the systemd-unit will no longer be set to `wantedBy = [ "multi-user.target" ]` and therefore the tunnel has to be enabled/disabled via `systemctl start/stop wg-quick-<name>`.

Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
2022-03-22 13:25:57 +00:00
Peter Hoeg 052632fd15 nixos/iwd: workaround for race condition where wlan device disappears 2022-03-22 19:36:51 +08:00
Ninjatrappeur 05417a66e7
Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers 2022-03-19 21:28:40 +01:00