Commit Graph
100 Commits
Author SHA1 Message Date
Kim Lindberger b897a166cb Merge pull request #139203 from NixOS/backport-138852-to-release-21.05
[Backport release-21.05] nixos/discourse: add discourse.admin.skipCreate option
2021-09-24 14:30:17 +02:00
Kim Lindberger 49c1d39164 Merge pull request #138606 from NixOS/backport-138160-to-release-21.05
[Backport release-21.05] pipewire: 0.3.35 -> 0.3.36
2021-09-20 12:51:29 +02:00
Kim Lindberger d15b1724c9 Merge pull request #138118 from NixOS/backport-137533-to-release-21.05
[Backport release-21.05] pipewire: 0.3.34 -> 0.3.35
2021-09-20 08:22:10 +02:00
Kim Lindberger 355b6d3675 Merge pull request #136572 from yu-re-ka/feature/gitaly-git2go-name-backport
[21.05] gitaly: Fix gitaly-git2go binary name
2021-09-03 16:28:26 +02:00
Kim Lindberger 9117f2a7d9 gitaly: Fix gitaly-git2go binary name (#136569)
https://gitlab.com/gitlab-org/gitaly/-/commit/e7f8fe4f6759669c24b2fd216beaab4a477c5b3d
changed the binary name to always end with its module version. This
makes sure gitaly's internal version references are set to the package
version and renames the binary, postfixing it with the package
version.

(cherry picked from commit d14e9188d1cd88f1b530bf860638c2de27486a6d)
2021-09-03 13:52:57 +02:00
talyz 698186588f gitlab: Enable puma's systemd notify support
(cherry picked from commit 3dd17ae22f17fb2f5f3bcf99437fe899d727beac)
2021-08-28 16:03:12 +02:00
talyz 2572e2550a gitlab: 14.1.2 -> 14.2.1
(cherry picked from commit 99387372d5af951fa7ab1cad970b7bef83b6b91c)
2021-08-28 16:03:12 +02:00
Kim Lindberger c37b973071 Merge pull request #135096 from NixOS/backport-135090-to-release-21.05
[Backport release-21.05] nomachine-client: 7.4.1 -> 7.6.2
2021-08-21 20:07:03 +02:00
talyz d6e092c25f nomachine-client: 7.4.1 -> 7.6.2
(cherry picked from commit 73bae61cda32b0aa20fd844b45387b8a50de5e20)
2021-08-21 17:58:15 +00:00
Kim Lindberger 64f5c7c6fd Merge pull request #134799 from NixOS/backport-132475-to-release-21.05
[Backport release-21.05] discourseAllPlugins: init discourse-ldap-auth
2021-08-20 18:06:54 +02:00
Kim Lindberger a1007637ce Merge pull request #133624 from talyz/discourse-backports
[21.05] discourse: 2.7.5 -> 2.7.7, plugins and fixes
2021-08-19 15:27:08 +02:00
talyz 18902d1e12 discourse: update.py: Remove native platforms in plugin lock files..
...and add ruby.

(cherry picked from commit 12ff4b79e48d9c4aa5660d2ec7ce52a21806d8e4)
2021-08-17 23:16:54 +02:00
talyz ba5434c984 discourse.mkDiscoursePlugin: Handle repos with gems directories
Some plugin repos already have a `gems` directory. This lets the
packager choose whether it should be kept and the nix packaged ruby
gems should be copied into it or if it should be removed in favor of
our ruby gems.

(cherry picked from commit 04e6b03fa91603c7f1961cfcdcf5880c91fe6b05)
2021-08-17 23:16:47 +02:00
talyz fd169abf9b discourse.plugins: Make the updater able to package plugins
Let the update.py script handle the initial, repetitive task of
packaging new plugins. With this in place, the plugin only needs to be
added to the list in `update-plugins` and most of the work will be
done automatically when the script is run. Metadata still needs to be
filled in manually and some packages may of course require additional
work/patching.

(cherry picked from commit f8096460bd15d4f13a01cfddf0a30798921fdb42)
2021-08-17 23:16:41 +02:00
talyz 08fde82d77 discourse.plugins.discourse-github: Update
(cherry picked from commit 4197b6dd146c395f1caec3b086334a2b0eff623a)
2021-08-17 23:16:34 +02:00
talyz af15cbe6b0 discourse: Change the path to the auto generated plugin assets
Change the path to the auto generated plugin assets, which defaults to
the plugin's directory and isn't writable at the time of asset
generation.

(cherry picked from commit 443b318ee9c614d480a2ecb0120b52806d6fbb3b)
2021-08-17 23:16:28 +02:00
talyz 080e4e43fb discourse.tests: Test the appropriate discourse package
Perform the tests on the package that the `tests` attribute is a child
of, i.e. if `discourseAllPlugins.tests` is built, the tests will run
with the `discourseAllPlugins` package, not the `discourse` package as
previously.

(cherry picked from commit 6fd5a40ccaf0b4da1362803a387bf46d381dd66a)
2021-08-17 23:16:18 +02:00
talyz 639e1d9639 discourse: Remove leftover link to unused plugins directory
(cherry picked from commit bb14315d51a1c35304dfd82ff5c1faeaaf2c450c)
2021-08-17 23:13:55 +02:00
talyz 202c17a806 discourse.plugins.discourse-data-explorer: Update
(cherry picked from commit 6f2652735817e22c55de3b6e137faf7cdbc3fd2a)
2021-08-17 23:13:49 +02:00
talyz 700cfb0fc3 discourse.plugins.discourse-solved: Update
(cherry picked from commit 92b758266e61b2efe078973a3d020b3d1a2c363d)
2021-08-17 23:13:43 +02:00
talyz fddb277d03 discourse.plugins.discourse-canned-replies: Update
(cherry picked from commit 5d94e3bfc94637f6876b9957471fc571646867b0)
2021-08-17 23:13:36 +02:00
talyz 4a30a10e62 discourse.plugins.discourse-calendar: Update
(cherry picked from commit d1a63bf19c6c75430393dab94f5e939b258ffdb6)
2021-08-17 23:13:30 +02:00
talyz f2533d47c8 discourse: 2.7.5 -> 2.7.7
(cherry picked from commit c97ae4ad8e782765b333840d8d1aa83903f82b7f)
2021-08-17 23:13:23 +02:00
Kim Lindberger 2fa8b636af Merge pull request #130271 from NixOS/backport-129464-to-release-21.05
[Backport release-21.05] discourse: Updates and fixes
2021-07-19 08:26:30 +02:00
talyz 955cdd607f discourse: 2.7.4 -> 2.7.5
(cherry picked from commit 60d78d7f1f218e19b1d0997ff4798c97a274cc47)
2021-07-15 19:59:04 +02:00
talyz 32c19b6bf8 discourse: Remove architecture bound platforms from Gemfile.lock
Maybe bundix doesn't handle them properly? They cause runtime issues
and don't seem necessary when the binary gems are built from scratch
anyway.

(cherry picked from commit a2dbc3af1d50edb8d646817e7abe799bcf369f20)
2021-07-15 12:54:01 +00:00
talyz 23c806f963 nixos/discourse: Update plugin documentation
Update the documentation regarding plugins to reflect recent changes.

(cherry picked from commit 20548f050e72a789ebbfe413b0fe7aa815e55c27)
2021-07-15 12:54:00 +00:00
talyz 09ccf575cd discourseAllPlugins: Provide a discourse derivation with all plugins
(cherry picked from commit eb122119a0fbd7f0c7b78dfcdfbc5d0cfada0c0f)
2021-07-15 12:54:00 +00:00
talyz 23cdb918f0 discourse: Add update-plugins action to update.py
(cherry picked from commit 3300282db3f8711a5ed5a5f627c4ddfb83168e3b)
2021-07-15 12:53:59 +00:00
talyz d57e97faef discourse.plugins: Update and add metadata
(cherry picked from commit d3bc5d5b7a9e0d5fc0f33aa0f0e91e50e9921805)
2021-07-15 12:53:59 +00:00
Kim Lindberger 5fd730e210 Merge pull request #128823 from NixOS/backport-127931-to-release-21.05
[Backport release-21.05] discourse: Fix plugin support
2021-07-15 14:50:11 +02:00
talyz 71474d1e41 discourse: Add a proper plugin builder + a few initial packages
Some discourse plugins have Ruby dependencies and require a
specialized builder. This introduces a generic builder that can be
used whether the plugin has Ruby dependencies or not. It also adds a
set of pre-packaged plugins available through `discourse.plugins` and
provides an easy way to add more.

(cherry picked from commit 7671b90919af8271bdf7e07bb86d63216a2145d6)
2021-06-30 22:07:26 +00:00
talyz 0a64a8b87c discourse: Patch sources instead of using replace-literal
(cherry picked from commit f0ae7fdf7e9518ab1fef4603daa860d5402f5b3b)
2021-06-30 22:07:25 +00:00
talyz 3b84448e67 discourse: Fix plugin support
For plugins to work properly, their assets need to be precompiled
along with the rest of Discourse's assets. This means we need to build
new packages when the list of plugins change.

(cherry picked from commit 9af3672f4faaafba0ce0129a87fc7925c14eeb61)
2021-06-30 22:07:25 +00:00
Kim Lindberger 3c6f3f84af Merge pull request #127679 from NixOS/revert-125407-patch-2
[21.05] Revert "php/generic: Allow to extend PHP_INI_SCAN_DIR"
2021-06-21 18:07:45 +02:00
Kim Lindberger b04df2100f Merge pull request #127652 from NixOS/backport-127454-to-release-21.05
[Backport release-21.05] keycloak: 13.0.1 -> 14.0.0
2021-06-21 16:32:55 +02:00
Kim Lindberger 65a1707f25 Revert "[21.05] php/generic: Allow to extend PHP_INI_SCAN_DIR" 2021-06-21 16:08:31 +02:00
Kim Lindberger 8201fae0e3 Merge pull request #127575 from NixOS/backport-127063-to-release-21.05
[Backport release-21.05] nixos/fail2ban: Remove `reloadIfChanged = true`
2021-06-20 20:08:37 +02:00
talyz d726b9c204 nixos/fail2ban: Remove reloadIfChanged = true
This makes the service fail when upgrading the package, so let's
properly restart it instead.

(cherry picked from commit b4c069b1476a92a540e906ef95cd7fb380d29c63)
2021-06-20 16:01:18 +00:00
Kim Lindberger b6cef599a4 Merge pull request #125407 from dxops/patch-2
[21.05] php/generic: Allow to extend PHP_INI_SCAN_DIR
2021-06-16 10:48:42 +02:00
Kim Lindberger dfbaf6023d Merge pull request #127014 from NixOS/backport-126969-to-release-21.05
[Backport release-21.05] discourse: 2.7.0 -> 2.7.4
2021-06-16 09:26:57 +02:00
talyz 4eec52ae4e discourse: 2.7.0 -> 2.7.4
(cherry picked from commit f7fb0d20a624c4d7fa12ba8a6e6d551655106a29)
2021-06-15 23:21:04 +00:00
Kim Lindberger ddc012dbea Merge pull request #126959 from NixOS/backport-126380-to-release-21.05
[Backport release-21.05] gitlab: Make sure the FOSS version isn't identified as EE
2021-06-15 18:00:01 +02:00
talyz d3d1674b3f gitlab: Make sure the FOSS version isn't identified as EE
(cherry picked from commit 8f16b1629155ad0022bb7830739081532d1bae50)
2021-06-15 15:16:10 +00:00
Kim Lindberger 34b9ccb9c8 Merge pull request #126956 from NixOS/backport-126892-to-release-21.05
[Backport release-21.05] gitlab: 13.12.3 -> 13.12.4
2021-06-15 17:10:34 +02:00
Kim Lindberger 32d2d13094 Merge pull request #126824 from NixOS/backport-126812-to-release-21.05
[Backport release-21.05] gitlab: 13.12.2 -> 13.12.3
2021-06-14 15:55:34 +02:00
Kim Lindberger 541e7d51c5 Merge pull request #126194 from NixOS/backport-126163-to-release-21.05
[Backport release-21.05] phpPackages.composer: 2.1.1 -> 2.1.2
2021-06-08 13:52:27 +02:00
Kim Lindberger 64393daa54 Merge pull request #125821 from NixOS/backport-125699-to-release-21.05
[Backport release-21.05] treewide: Fix mysql alias deprecation breakage
2021-06-06 08:53:44 +02:00
talyz a60818cacd treewide: Fix mysql alias deprecation breakage
62733b37b4 broke evaluation in all
places `pkgs.mysql` was used. Fix this by changing all occurrences to
`pkgs.mariadb`.

(cherry picked from commit 59e0120aa5c1241d48048afa615e25c65d7e366d)
2021-06-05 17:11:40 +00:00
Kim Lindberger 4c4a45e284 Merge pull request #124945 from NixOS/backport-124472-to-release-21.05
[Backport release-21.05] keycloak: 13.0.0 -> 13.0.1
2021-05-30 10:47:01 +02:00
talyz b423efaeeb nixos/discourse: Assert deployed PostgreSQL version
Assert that the PostgreSQL version being deployed is the one used
upstream. Allow the user to override this assertion, since it's not
always possible or preferable to use the recommended one.

(cherry picked from commit 544adbfcab2e92c2fe5774cae67f2edf165eb97e)
2021-05-28 22:16:10 -07:00
talyz ce5587e7bb discourse: 2.6.5 -> 2.7.0
(cherry picked from commit 42b8e7685d5fe5280f8f6101a6d19016b92f3a5c)
2021-05-28 22:16:10 -07:00
Kim Lindberger df25a8867f Merge pull request #124138 from talyz/21.05-php-iconv-errno
[21.05] php74.extensions.iconv: fix error signalling
2021-05-23 17:48:31 +02:00
Kim Lindberger 1693374dbd synergy: 1.11.1 -> 1.13.1.41 (#123359) 2021-05-23 01:55:42 +02:00
talyz 2d8a870813 keycloak.tests: Test HTTPS support 2021-05-21 13:09:43 +02:00
talyz ba00b0946e nixos/keycloak: Split certificatePrivateKeyBundle into two options
Instead of requiring the user to bundle the certificate and private
key into a single file, provide separate options for them. This is
more in line with most other modules.
2021-05-21 13:09:38 +02:00
talyz dbf91bc2f1 nixos/keycloak: keycloak.database* -> keycloak.database.*
Move all database options to their own group / attribute. This makes
the configuration clearer and brings it in line with most other modern
modules.
2021-05-21 13:09:32 +02:00
talyz 83e406e97a nixos/keycloak: frontendUrl always needs to be suffixed with /
In some places, Keycloak expects the frontendUrl to end with `/`, so
let's make sure it always does.
2021-05-21 13:09:25 +02:00
talyz 58614f8416 nixos/keycloak: Add myself to maintainers 2021-05-21 13:09:19 +02:00
talyz d748c86389 nixos/keycloak: Improve readablility by putting executables in PATH 2021-05-21 13:09:14 +02:00
talyz 8309368e4c nixos/keycloak: Set umask before copying sensitive files
`install` copies the files before setting their mode, so there could
be a breif window where the secrets are readable by other users
without a strict umask.
2021-05-21 13:09:09 +02:00
talyz c2bebf4ee2 nixos/keycloak: Improve bash error handling 2021-05-21 13:09:03 +02:00
talyz d6727d28e1 nixos/keycloak: Set the postgresql database password securely
Feeding `psql` the password on the command line leaks it through the
`psql` process' `/proc/<pid>/cmdline` file. Using `echo` to put the
command in a file and then feeding `psql` the file should work around
this, since `echo` is a bash builtin and thus shouldn't spawn a new
process.
2021-05-21 13:08:53 +02:00
Kim Lindberger f131787bb6 Merge pull request #121708 from talyz/replace-secret
treewide: Replace uses of `replace-literal` with `replace-secret` to avoid leaking secrets
2021-05-19 09:34:51 +02:00
talyz 380b52c737 nixos/keycloak: Use replace-secret to avoid leaking secrets
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:28 +02:00
talyz 88b76d5ef9 nixos/mpd: Use replace-secret to avoid leaking secrets
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead.
2021-05-19 09:32:22 +02:00
talyz 3a29b7bf5b nixos/mpdscribble: Use replace-secret to avoid leaking secrets
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:17 +02:00
talyz 7842e89bfc nixos/gitlab: Use replace-secret to avoid leaking secrets
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:12 +02:00
talyz 38398fade1 nixos/discourse: Use replace-secret to avoid leaking secrets
Using `replace-literal` to insert secrets leaks the secrets through
the `replace-literal` process' `/proc/<pid>/cmdline`
file. `replace-secret` solves this by reading the secret straight from
the file instead, which also simplifies the code a bit.
2021-05-19 09:32:06 +02:00
talyz 27f8f6956a replace-secret: Init
Add a small utility script which securely replaces secrets in
files. Doing this with `sed`, `replace-literal` or similar utilities
leaks the secrets through the spawned process' `/proc/<pid>/cmdline` file.
2021-05-19 09:32:00 +02:00
talyz 5926b95fbe webkitgtk: Fix bubblewrap opengl-driver path
If `/run/opengl-driver/lib` is in `LD_LIBRARY_PATH`, bwrap will try to
mount it into the already bind mounted `/run/opengl-driver`. To
prevent this, we instead specify the subpaths of `/run/opengl-driver`
we're interested in.

Also, use the correct path for i686 builds.
2021-05-10 13:05:48 +02:00
Kim Lindberger eeece47a52 Merge pull request #121985 from r-ryantm/auto-update/keycloak
keycloak: 12.0.4 -> 13.0.0
2021-05-07 13:11:44 +02:00
talyz 360abc8e2a v8: Fix darwin build 2021-05-07 11:57:58 +02:00
talyz 8f83860a0a keycloak.tests: Make sure databaseUsername is either ignored...
...or used correctly.
2021-05-04 19:27:08 +02:00
talyz deb58f6486 nixos/keycloak: Document how to use a custom local database 2021-05-04 19:27:08 +02:00
talyz fdf6bb5b95 Revert "nixos/keycloak: use db username in db init scripts"
This reverts commit d9e18f4e7f.

This change is broken, since it doesn't configure the proper database
username in keycloak when provisioning a local database with a custom
username. Its intended behavior is also potentially confusing and
dangerous, so rather than fixing it, let's revert to the old one.
2021-05-04 19:27:08 +02:00
Kim Lindberger fdd6ca8fce Merge pull request #118898 from talyz/gitlab-memory-bloat
nixos/gitlab: Add options to tame GitLab's memory usage somewhat
2021-04-30 16:58:30 +02:00
Kim Lindberger abecdfea73 Merge pull request #120833 from talyz/pipewire-0.3.26
pipewire: 0.3.25 -> 0.3.26
2021-04-29 18:46:35 +02:00
Kim Lindberger 3bed46e4b9 Merge pull request #114175 from eyJhb/php-phpdbg-disable
php: fixed not being able to disable phpdbgSupport
2021-04-28 10:46:47 +02:00
Kim Lindberger e50164a7ce Merge pull request #113201 from talyz/gitlab-db-key-base-patch
gitlab: Add patch for db_key_base length bug, fix descriptions
2021-04-27 19:25:43 +02:00
talyz 1215bd4ea9 Revert "nixos/tests/gitlab: add 32 byte secrets"
This reverts commit d6e0d38b84.

We need shorter secrets to continue working, since the earlier
recommendation was too short and there's no way to rotate the them.
2021-04-27 18:08:59 +02:00
talyz 7a67a2d1a8 gitlab: Add patch for db_key_base length bug, fix descriptions
The upstream recommended minimum length for db_key_base is 30 bytes,
which our option descriptions repeated. Recently, however, upstream
has, in many places, moved to using aes-256-gcm, which requires a key
of exactly 32 bytes. To allow for shorter keys, the upstream code pads
the key in some places. However, in many others, it just truncates the
key if it's too long, leaving it too short if it was to begin
with. This adds a patch that fixes this and updates the descriptions
to recommend a key of at least 32 characters.

See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602
2021-04-27 17:49:43 +02:00
talyz fb86d324d1 pipewire: Add update script 2021-04-27 16:50:22 +02:00
talyz 6edd102013 pipewire: Fix tests 2021-04-27 12:41:35 +02:00
talyz 24320ba1dd pipewire: 0.3.25 -> 0.3.26 2021-04-27 12:41:30 +02:00
Kim Lindberger 37f49597e3 Merge pull request #118861 from talyz/gitlab-shell-fix
gitlab-shell: 13.15.1 -> 13.17.0
2021-04-16 16:17:58 +02:00
Kim Lindberger 7124e24a47 Merge pull request #119596 from talyz/discourse-2.6.5
discourse: 2.6.3 -> 2.6.5, module fixes
2021-04-16 16:06:47 +02:00
talyz 7310dd0da8 nixos/discourse: Fix plugin linking
When linking multiple plugins, the `ln` runs need to be separated by
newlines..

Fixes #119584.
2021-04-16 14:21:07 +02:00
talyz 515fb48312 nixos/discourse: Fail on file errors
Bash doesn't handle subshell errors properly if the result is used as
input to a command. To cause the services to fail when the files can't
be read, we need to assign the value to a variable, then export it
separately.
2021-04-16 14:21:01 +02:00
talyz 2db1ae068d discourse: 2.6.3 -> 2.6.5 2021-04-16 14:20:56 +02:00
Kim Lindberger 59917dc3a9 Merge pull request #119427 from talyz/tengine-modules
tengine: Add modules to passthru
2021-04-14 17:42:01 +02:00
talyz 4aab79918e tengine: Add passthru.tests 2021-04-14 16:56:54 +02:00
talyz 1ef95a8c5f nginx: Add all the nginx tests to passthru.tests 2021-04-14 16:39:35 +02:00
talyz 06dee38345 Revert "nixos/nginx: fix eval for tengine"
This reverts commit 2d3200e010.
2021-04-14 16:34:10 +02:00
talyz fd10431871 tengine: Add modules to passthru
Follow the interface of the `nginx` package and expose the enabled
modules. This is used in the `nginx` module to enable the
`additionalModules` option.
2021-04-14 16:14:28 +02:00
Kim Lindberger 2111e0cde8 Merge pull request #119114 from bkchr/bkchr-lorri-1.4.0
lorri: 1.3.1 -> 1.4.0
2021-04-12 09:39:41 +02:00
talyz 6389170b39 nixos/gitlab: Set MALLOC_ARENA_MAX to "2"
This should reduce memory fragmentation drastically and is recommended
by both the Puma and the Sidekiq author. It's also the default value
for Ruby deployments on Heroku.
2021-04-10 10:49:31 +02:00
talyz 306fc0648b nixos/gitlab: Add Sidekiq MemoryKiller support
Restart sidekiq automatically when it consumes too much memory. See
https://docs.gitlab.com/ee/administration/operations/sidekiq_memory_killer.html
for details.
2021-04-10 10:49:24 +02:00
talyz 6230936be2 nixos/gitlab: Add options to control puma worker and threads numbers 2021-04-10 10:49:18 +02:00
talyz 7377a1dfa6 gitlab-shell: 13.15.1 -> 13.17.0
Only the version had been updated previously, not the hashes and
patches.
2021-04-09 00:36:32 +02:00