3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

323 commits

Author SHA1 Message Date
figsoda 6bb0dbf91f nixos: fix typos 2022-12-17 19:31:14 -05:00
Daniel Nagy ad866e565d
treewide: switch to port type for nixos modules 2022-12-08 00:00:00 +01:00
Daniel Nagy b4674b39c1
treewide: use mkEnableOption in nixos modules 2022-11-10 09:30:00 +01:00
Sandro 432e5e65a9
Merge pull request #197104 from Luflosi/kubo-RFC42 2022-10-27 23:48:33 +02:00
KFears 9f963f36e5 nixos/grafana: refactor settings for RFC42 2022-10-22 23:56:14 +04:00
Luflosi a255c43f44
nixos/kubo: convert to RFC42-style settings 2022-10-21 20:54:00 +02:00
Luflosi eefaaf41d6
kubo: rename from ipfs
Go-IPFS was renamed to Kubo in version 0.14.0, see https://github.com/ipfs/kubo/issues/8959.
2022-10-02 16:00:22 +02:00
pennae f2ea09ecbe nixos/*: convert options with listings
minor rendering changes.
2022-08-31 17:27:36 +02:00
pennae 722b99bc0e nixos/*: convert options with admonitions to MD
rendering changes only slightly, most changes are in spacing.
2022-08-31 16:36:16 +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 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 087472b1e5 nixos/*: automatically convert option docs 2022-08-06 20:39:12 +02: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 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
Sandro f7f8721b1e
Merge pull request #162689 from astro/glusterfs
nixos/glusterfs: exclude hook "S10selinux-label-brick.sh"
2022-07-21 22:15:00 +02:00
Artturi 3cff3f75b4
Merge pull request #166340 from max-privatevoid/patch-6 2022-06-28 19:55:10 +03:00
Max 2a8bf9777d nixos/ipfs: do not leak config to journal on startup
The preStart script for the IPFS service will print parts of the configuration
to stdout (and therefore, the journal) when applying profiles on startup. This
may lead to unwanted disclosure of private information, such as remote pinning
service API keys. Fix by sending stdout to /dev/null.
2022-06-17 23:41:27 +02:00
Max 72d6d73e37 nixos/ipfs: Only set ReadWritePaths when hardened
Co-authored-by: Luflosi <Luflosi@users.noreply.github.com>
2022-04-16 20:48:28 +02:00
Luflosi faad370edc nixos/ipfs: fix the services.ipfs.autoMigrate option
Apparently this was never properly tested and never worked. When the IPFS repo needs upgrading, the first call to ipfs, which is run before running the migration, fails with the error message "Error: ipfs repo needs migration".
To fix this, simply run the migration before any `ipfs config` calls but don't run it when `dataDir` is empty and we need to call `ipfs init`.
Writing a NixOS test for this would require keeping at least two versions of IPFS in Nixpkgs, which we don't currently do.
2022-04-16 07:38:13 -04:00
Luflosi 8a5e51525d nixos/ipfs: add Luflosi as maintainer 2022-04-16 07:38:13 -04:00
Luflosi 6b2eca8d56 nixos/ipfs: remove unused code
This code became obsolete with 4044d81d5c, just a couple days after it was introduced.
2022-04-16 07:38:13 -04:00
Robert Hensing 39e0bd705b
Merge pull request #165259 from Luflosi/ipfs-recursiveUpdate
nixos/ipfs: use lib.recursiveUpdate instead of // operator
2022-04-05 19:16:39 +02:00
Luflosi ec415055ba nixos/ipfs: improve how the commandline flags are generated
Use `utils.escapeSystemdExecArgs` instead of relying on the exact way in which `toString` formats a list.
In https://github.com/NixOS/nixpkgs/pull/156706#discussion_r795867283 a suggestion was made and then implemented to replace `toString` with `concatStringsSep " "`.
@pennae then suggested to use `utils.escapeSystemdExecArgs` instead in https://github.com/NixOS/nixpkgs/pull/164846#issuecomment-1073001848.
2022-03-24 20:42:07 +00:00
Luflosi 38f1576ba9
nixos/ipfs: use lib.recursiveUpdate instead of // operator
Use `recursiveUpdate` instead of the // operator, as recommended in https://nix.dev/anti-patterns/language#attr1-attr2-merge-operator. Without this change, setting `services.ipfs.extraConfig.Addresses.NoAnnounce` for example will cause `services.ipfs.apiAddress`, `services.ipfs.gatewayAddress` and `services.ipfs.swarmAddress` to be ignored.
2022-03-22 13:01:35 +01:00
Luflosi 41d45d674a
nixos/ipfs: add systemd hardening
Use the hardened systemd unit from upstream.
2022-03-22 11:12:14 +01:00
Pascal Bach 4c3c80df54
Merge pull request #114393 from DarkDNA/feature/samba/network-online
nixos/samba: Add a wants=network-online.target to the target.
2022-03-21 19:25:50 +01:00
Astro 06ea5e780b nixos/glusterfs: exclude hook "S10selinux-label-brick.sh"
fails due to missing selinux binaries
2022-03-06 21:09:05 +01:00
Luflosi 0eb1d070c8 ipfs-migrator: 1.7.1 -> 2.0.2
https://github.com/ipfs/fs-repo-migrations/releases/tag/v2.0.2

This is pretty much a complete rewrite of the ipfs-migrator package.
In version 2.0.0 a major change was made to the way the migrator works. Before, there was one binary that contained every migration. Now every migration has its own binary. If fs-repo-migrations can't find a required binary in the PATH, it will download it off the internet. To prevent that, build every migration individually, symlink them all into one package and then wrap fs-repo-migrations so it finds the package with all the migrations.
The change to the IPFS NixOS module and the IPFS package is needed because without explicitly specifying a repo version to migrate to, fs-repo-migrations will query the internet to find the latest version. This fails in the sandbox, for example when testing the ipfs passthru tests.
While it may seem like the repoVersion and IPFS version are in sync and the code could be simplified, this is not the case. See https://github.com/ipfs/fs-repo-migrations#when-should-i-migrate for a table with the IPFS versions and corresponding repo versions.
Go 1.17 breaks the migrations, so use Go 1.16 instead. This is also the Go version used in their CI, see 3dc218e300/.github/workflows/test.yml (L4). See https://github.com/ipfs/fs-repo-migrations/pull/140#issuecomment-982715907 for a previous mention of this issue. The issue manifests itself when doing anything with a migration, for example `fs-repo-11-to-12 --help`:
```
panic: qtls.ClientHelloInfo doesn't match

goroutine 1 [running]:
github.com/marten-seemann/qtls-go1-15.init.0()
	github.com/marten-seemann/qtls-go1-15@v0.1.1/unsafe.go:20 +0x132
```
Also add myself as a maintainer for this package.
This fixes the test failure discovered in https://github.com/NixOS/nixpkgs/pull/160914.
See https://github.com/ipfs/fs-repo-migrations/issues/148 to read some of my struggles with updating this package.
2022-02-25 11:12:19 -08:00
Jonathan Ringer 39669ea2b6
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/top-level/aliases.nix
2022-02-09 19:58:40 -08:00
Jörg Thalheim 30d7dbc2be
nixos/rsyncd: fix module eval 2022-02-09 08:21:00 +01:00
github-actions[bot] 4e2cf99754
Merge master into staging-next 2022-02-07 12:01:12 +00:00
markuskowa 768dd74738
Merge pull request #140891 from markuskowa/os-moosefs
nixos: init moosefs module and test
2022-02-07 10:48:33 +01:00
Jonathan Ringer 46fd0afcb3
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/pysdl2/default.nix
	pkgs/top-level/aliases.nix
2022-02-06 18:36:59 -08:00
Kevin Cox c2038731e4
Merge pull request #158348 from schnusch/ipfs
nixos/ipfs: use ipfs config replace
2022-02-06 18:11:36 -05:00
schnusch 97f809dc87 nixos/ipfs: use ipfs config replace 2022-02-06 21:42:56 +01:00
Markus Kowalewski d86fef1a57
nixos/doc: add moosefs module to release notes 2022-02-03 12:33:44 +01:00
Markus Kowalewski b302bda010
nixos: init moosefs module 2022-02-03 12:31:31 +01:00
Sandro Jäckel b20ad47fa3 nixos/ceph: mime-types -> mailcap 2022-01-26 14:30:10 -08:00
Pascal Bach e6217908a3 nixos/glusterfs: remove syslog.target from services 2021-12-11 22:43:02 +01:00
spacefrogg fe44db8271
openafsServer: remove dependency on syslog.target (#150294)
syslog.target has been deprecated and removed
2021-12-11 14:46:23 -05:00
Robert Hensing 862d167f17
Merge pull request #147441 from pennae/option-doc-staticizing
nixos/*: add trivial defaultText to options where applicable
2021-12-06 01:35:38 +01:00
pennae 2512455639 nixos/*: add trivial defaultText for options with simple defaults 2021-12-02 22:35:04 +01:00
Ryan Mulligan aa37441c3e nixos/drbd: fix
- fix environment.etc."drbd.conf"
- don't generate an ExecStart script for just one command
2021-11-30 21:43:51 +01:00
Peng Mei Yu 4abccb5466 nixos/webdav: set uid and gid 2021-11-30 10:19:14 +08:00
Peng Mei Yu ce4ad53e6a nixos/webdav-server-rs: init 2021-11-30 10:19:14 +08:00
Peng Mei Yu 640e54cda9 maintainers: Rename pengmeiyu to pmy 2021-11-29 18:39:31 +08:00
Peng Mei Yu 5609f84d1b nixos/webdav: init 2021-11-08 23:56:27 +08:00
Michael Hoang 43d2eefea6 nixos/samba: Add openFirewall option 2021-10-19 19:11:02 +11:00