0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-09 20:16:16 +03:00
Commit graph

2645 commits

Author SHA1 Message Date
Weijia Wang
8c734937d6 nixos/sourcehut: fix eval 2023-11-30 02:52:50 +01:00
Weijia Wang
feeae486de
Merge pull request #261702 from h7x4/replace-mkoption-with-mkpackageoption
treewide: use `mkPackageOption`
2023-11-30 02:49:30 +01:00
tomberek
a2de752222
Merge pull request #267538 from nessdoor/pkgs/paste.sr.ht
sourcehut.pastesrht: add missing backend component
2023-11-28 12:40:09 -05:00
Nick Cao
e0ece67a97
Merge pull request #270256 from schmittlauch/gite-forgejo-migration-phrasing
nixos/forgejo docs: correct phrasing
2023-11-27 09:33:21 -05:00
Tomas Antonio Lopez
9e6f9c6d83 nixos/sourcehut: remove usages of 'with lib;'
Inherit library attributes at a finer granularity, instead.
2023-11-27 08:22:48 -03:00
Tomas Antonio Lopez
ba6817ed22 nixos/sourcehut: add myself as maintainer 2023-11-27 08:22:48 -03:00
Tomas Antonio Lopez
087c83f45c nixos/sourcehut: reformat expressions using nixpkgs-fmt 2023-11-27 08:22:48 -03:00
h7x4
0a37316d6c
treewide: use mkPackageOption
This commit replaces a lot of usages of `mkOption` with the package
type, to be `mkPackageOption`, in order to reduce the amount of code.
2023-11-27 01:28:36 +01:00
Trolli Schmittlauch
0e893a9f22 nixos/forgejo docs: correct phrasing 2023-11-26 21:43:32 +01:00
Maciej Krüger
b63af5d7ea
Merge pull request #265728 from nbraud/nixos/sudo-rs/ssm-agent 2023-11-26 21:37:15 +01:00
Lin Jian
5ba42a0de2
Merge pull request #260902 from LDprg/master
preload: init at 0.6.4
2023-11-25 23:29:40 -06:00
LDprg
a0f5d5e500 nixos/preload: init 2023-11-25 20:07:10 +01:00
Robert Hensing
779e50580c
Merge pull request #224611 from srhb/kafka-settings-module
Kafka: Settings and KRaft support
2023-11-23 17:35:29 +01:00
Sarah Brofeldt
cfe3ca1f2f nixos/apache-kafka: Add manual chapter 2023-11-22 06:47:09 +01:00
Sarah Brofeldt
45f84cdfd5 nixos/apache-kafka: structured settings
- Use lazyAttrs (for config references) settings for main server.properties.
- Drop dangerous default for "log.dirs"
- Drop apache-kafka homedir; unused and confusing
- Support formatting kraft logdirs
2023-11-22 06:47:08 +01:00
Mario Rodas
fa14a14694
Merge pull request #258036 from anthonyroussel/fix-ssm-seelog
nixos/amazon-ssm-agent: fix missing seelog.xml file
2023-11-19 18:55:57 -05:00
Nick Cao
d936414252
Merge pull request #268132 from bendlas/forgejo-release-notes
nixos/forgejo/docs: fix typo
2023-11-18 09:39:29 -05:00
emilylange
b3e8dae766 nixos/forgejo: remove postgresql_15 permission work-around
This is no longer necessary as of
ccfe07c316.

Previously: b8585a119c.
2023-11-18 12:14:09 +01:00
Ryan Lahfa
ccfe07c316
Merge pull request #266270 from Ma27/postgresql-ownership-15 2023-11-17 18:02:17 +01:00
Herwig Hochleitner
8c441fc2a7 nixos/forgejo/docs: fix typo 2023-11-17 17:18:57 +01:00
Herwig Hochleitner
20832d5995
nixos/forgejo: changelog and migration instructions (#267248)
* nixos/forgejo: changelog and migration instructions

* nixos/forgejo/docs: clarify sentence

Co-authored-by: Trolli Schmittlauch <schmittlauch@users.noreply.github.com>

* nixos/forgejo/docs: document migration via gitea impersonation

* nixos/forgejo/docs: note about url change on migration

* nixos/forgejo/docs: note about migration (non-)requirement

* nixos/forgejo/docs: header ids

* nixos/forgejo/docs: clarify release notes entry

Co-authored-by: Emily <git@emilylange.de>

* nixos/forgejo/docs: improve manual entry

Co-authored-by: Emily <git@emilylange.de>

* nixos/forgejo/docs: move changelog line to the middle of the section

as noted <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

---------

Co-authored-by: Trolli Schmittlauch <schmittlauch@users.noreply.github.com>
Co-authored-by: Emily <git@emilylange.de>
2023-11-17 15:55:24 +01:00
Raito Bezarius
7cd63bff21 nixos/sourcehut: do not use ensureDBOwnership
Given that SourceHut uses unfortunate defaults for database name, it will not
be realistic to fix this in time for 23.11.

We will leave the workaround and leave it to SourceHut maintainers to pick up the work
to clean this up after 23.11.
2023-11-17 15:52:51 +01:00
zzywysm
3f4c802d26 initrd/autofs4: remove legacy references to autofs4 kernel module
Back in 2018, the kernel decided to remove the autofs4 module.

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=a2225d931f75ddd3c39f4d0d195fad99dfd68671

This caused immediate problems with systemd, so the kernel allowed autofs4 as a config option that would simply map back to autofs.

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d02d21ea007b6b33cdaf15c2f84fb1fea996ecc2

Earlier this year, in July 2023, the kernel got tired of people not adapting to the autofs change, and forced the issue by fixing it within the kernel defconfigs, which NixOS uses as a starting point for their own kernel configs.

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1f2190d6b7112d22d3f8dfeca16a2f6a2f51444e

This commit reflects the post-2018 reality by changing the remaining autofs4 references to autofs. Since this change initially happened in kernel 4.18 and we no longer support 4.x kernels, we don't need any backwards-compatibility tweaks.
2023-11-14 15:37:50 -05:00
Tomas Antonio Lopez
5476b490d4 nixos/sourcehut: compile and integrate paste.sr.ht API component 2023-11-14 11:12:14 +01:00
Maximilian Bosch
48459567ae nixos/postgresql: drop ensurePermissions, fix ensureUsers for postgresql15
Closes #216989

First of all, a bit of context: in PostgreSQL, newly created users don't
have the CREATE privilege on the public schema of a database even with
`ALL PRIVILEGES` granted via `ensurePermissions` which is how most of
the DB users are currently set up "declaratively"[1]. This means e.g. a
freshly deployed Nextcloud service will break early because Nextcloud
itself cannot CREATE any tables in the public schema anymore.

The other issue here is that `ensurePermissions` is a mere hack. It's
effectively a mixture of SQL code (e.g. `DATABASE foo` is relying on how
a value is substituted in a query. You'd have to parse a subset of SQL
to actually know which object are permissions granted to for a user).

After analyzing the existing modules I realized that in every case with
a single exception[2] the UNIX system user is equal to the db user is
equal to the db name and I don't see a compelling reason why people
would change that in 99% of the cases. In fact, some modules would even
break if you'd change that because the declarations of the system user &
the db user are mixed up[3].

So I decided to go with something new which restricts the ways to use
`ensure*` options rather than expanding those[4]. Effectively this means
that

* The DB user _must_ be equal to the DB name.
* Permissions are granted via `ensureDBOwnerhip` for an attribute-set in
  `ensureUsers`. That way, the user is actually the owner and can
  perform `CREATE`.
* For such a postgres user, a database must be declared in
  `ensureDatabases`.

For anything else, a custom state management should be implemented. This
can either be `initialScript`, doing it manual, outside of the module or
by implementing proper state management for postgresql[5], but the
current state of `ensure*` isn't even declarative, but a convergent tool
which is what Nix actually claims to _not_ do.

Regarding existing setups: there are effectively two options:

* Leave everything as-is (assuming that system user == db user == db
  name): then the DB user will automatically become the DB owner and
  everything else stays the same.

* Drop the `createDatabase = true;` declarations: nothing will change
  because a removal of `ensure*` statements is ignored, so it doesn't
  matter at all whether this option is kept after the first deploy (and
  later on you'd usually restore from backups anyways).

  The DB user isn't the owner of the DB then, but for an existing setup
  this is irrelevant because CREATE on the public schema isn't revoked
  from existing users (only not granted for new users).

[1] not really declarative though because removals of these statements
    are simply ignored for instance: https://github.com/NixOS/nixpkgs/issues/206467
[2] `services.invidious`: I removed the `ensure*` part temporarily
    because it IMHO falls into the category "manage the state on your
    own" (see the commit message). See also
    https://github.com/NixOS/nixpkgs/pull/265857
[3] e.g. roundcube had `"DATABASE ${cfg.database.username}" = "ALL PRIVILEGES";`
[4] As opposed to other changes that are considered a potential fix, but
    also add more things like collation for DBs or passwords that are
    _never_ touched again when changing those.
[5] As suggested in e.g. https://github.com/NixOS/nixpkgs/issues/206467
2023-11-13 17:16:25 +01:00
dadada
f192930a79
nixos/soft-serve: fix typos in option descriptions 2023-11-12 22:34:54 +01:00
tomberek
7859adb9d6
Merge pull request #245394 from christoph-heiss/pkgs/sourcehut
sourcehut: update all component; lots of fixes
2023-11-11 13:42:19 -05:00
Christoph Heiss
88a3d2a0b4
sourcehut: fix postgresql database permission for postgresql >= 15
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 15:50:16 +01:00
Christoph Heiss
66b86f8a2e
sourcehut: de-duplicate nginx add_header directives
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 14:14:59 +01:00
Christoph Heiss
acd21dad52
sourcehut: use systemd.tmpfiles instead of manually creating logfiles
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 14:14:59 +01:00
Christoph Heiss
641e54bb28
sourcehut: create logs directory unconditionally
An empty log directory, in case it stays unused, does not hurt anyone.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:47 +01:00
Christoph Heiss
fc6addb147
sourcehut: reword api-origin option description
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:47 +01:00
Christoph Heiss
78cc2783c8
sourcehut: drop obsolete services array in favor of indivdual enable flags
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:47 +01:00
Christoph Heiss
6b25e09d2d
sourcehut: fix up some more bin paths
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:47 +01:00
Christoph Heiss
5841d27497
sourcehut: explicitly disallow openssh to socket-active
This breaks the (already fragile) gitsrht-dispatch -> gitsrht-keys
command chain.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:47 +01:00
Christoph Heiss
c39ba7f5b1
sourcehut: remove set -x from ssh commands
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:46 +01:00
Christoph Heiss
6648488333
sourcehut: fix logging of git/hg ssh commands
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:45 +01:00
Christoph Heiss
6e51802196
sourcehut: fix repos path by using actual settings value
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:32 +01:00
Christoph Heiss
c123a37be6
sourcehut.gitsrht: 0.78.20 -> 0.84.2
Newer version of the gitsrht-api service call setrlimit() on startup,
thus allow it in the `SystemCallFilter` definition for the service.

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 13:01:30 +01:00
Christoph Heiss
d703173520
sourcehut: make /query endpoint config common to all services
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
2023-11-11 12:39:28 +01:00
Anthony Roussel
e30f48be94
treewide: fix redirected and broken URLs
Using the script in maintainers/scripts/update-redirected-urls.sh
2023-11-11 10:49:01 +01:00
Anthony Roussel
3dd50eaa8f
nixos/amazon-ssm-agent: fix missing seelog.xml file 2023-11-09 12:02:48 +01:00
nicoo
690f027251 nixos/ssm-agent: Handle sudo-rs too 2023-11-05 20:49:41 +00:00
Martin Weinelt
05e8361387
Merge pull request #261867 from matrss/set-paperless-secret-key
nixos/paperless: set PAPERLESS_SECRET_KEY
2023-11-01 12:33:23 +01:00
arcnmx
0711d3d69b xmrig: add meta.mainProgram
See #246386
2023-10-28 11:21:57 -07:00
Matthias Riße
63ef033992 nixos/paperless: set PAPERLESS_SECRET_KEY
If the PAPERLESS_SECRET_KEY environment variable is left unset
paperless-ngx defaults to a well-known value, which is insecure.

Co-authored-by: Erik Arvstedt <erik.arvstedt@gmail.com>
2023-10-27 21:11:01 +02:00
Mario Rodas
84a877ed30
Merge pull request #261722 from anthonyroussel/ssm-agent-rename
amazon-ssm-agent: rename from ssm-agent
2023-10-25 04:18:24 -05:00
emilylange
402b5c67a8
nixos/forgejo: pass {env}GIT_PROTOCOL via ssh to forgejo
when using the host's openssh service (not the builtin golang one).

This enables the use of the much faster and more efficient wire protocol
version 2.
See https://git-scm.com/docs/protocol-v2
2023-10-24 03:27:20 +02:00
Anthony Roussel
ccf080ee05
amazon-ssm-agent: rename from ssm-agent 2023-10-22 22:04:09 +02:00
Emily
a61c6b478d
Merge pull request #262741 from emilylange/nixos-forgejo-postgres15
nixos/forgejo: work around permissions error on `postgresql_15`
2023-10-22 21:04:41 +02:00