17333 Commits

Author SHA1 Message Date
Maciej Krüger
8429831b67
Merge pull request #112746 from mkg20001/qemu-extra-disks 2021-02-14 13:20:44 +01:00
Maximilian Bosch
055b7e2a5d
nixos/nextcloud: fix regex to not return 404 on ACME challenges
Fixes #113027
2021-02-14 12:23:16 +01:00
github-actions[bot]
45fadd9b7f
Merge staging-next into staging 2021-02-14 00:37:59 +00:00
pasqui23
04ef00987a
nixos/switcheroo-control: add to modules-list.nix (#113052) 2021-02-14 01:06:01 +01:00
WORLDofPEACE
452f7e14d4 nixos/tools: generate an xserver config
The desktop configuration won't enable xserver.
If there's multiple desktops enabled they will now evaluate properly.
2021-02-13 18:46:01 -05:00
WORLDofPEACE
94f0210e60 nixos/tools: make desktopConfiguation types.listOf types.lines
This fixes #108124.
2021-02-13 18:45:27 -05:00
zowoq
37f1ed7ca4 nixos/podman: install systemd files
- install podman service and socket
- install podman tmpfile
2021-02-14 06:57:39 +10:00
github-actions[bot]
d10b7b45fb
Merge staging-next into staging 2021-02-13 18:16:03 +00:00
Milan
3b77e7c967
nixos/jitsi-videobridge: add apis option (#112960)
The `--apis=` command line parameter passed to Jitsi Videobridge is
required to monitor a Jitsi Meet instance for example via the prometheus
exporter [jitsiexporter](https://git.xsfx.dev/prometheus/jitsiexporter).
2021-02-13 15:04:58 +01:00
github-actions[bot]
37c77840b8
Merge staging-next into staging 2021-02-13 12:19:41 +00:00
Jörg Thalheim
c875e8e673
Merge pull request #107394 from yorickvP/beam-nox 2021-02-13 09:01:06 +00:00
github-actions[bot]
1e189fbb9e
Merge staging-next into staging 2021-02-13 06:16:37 +00:00
aszlig
2d5a31a3ef
Merge pull request #112819 (mkIf in systemd units)
@thelegy writes:

  unitOption is only used inside of attrsOf wich is perfectly capable of
  handling the attrsets from mkIf, though the checkUnitConfig test
  forbids it.

  This commit weakens that restriction to allow the usage of mkIf inside
  of systemd.services.<name>.serviceConfig.<something> etc.

While I personally don't like that we can't easily use
pushDownProperties from the module system and need to rely on internals,
we *already* use internals for the mkOverride case, so adding another
case for mkIf doesn't add a hard-to-find indirection.

I'm merging this, since this fixes a valid use case and it shouldn't
make refactoring worse than before.
2021-02-13 05:24:11 +01:00
github-actions[bot]
c4d734932d
Merge staging-next into staging 2021-02-13 00:36:15 +00:00
Luke Granger-Brown
cfed3b8b22 treewide: update 21.03 to 21.05
The NixOS 21.03 release has been delayed to 21.05. See NixOS/rfcs#80.

There are two instances of 21.03 which have been left as is, since they
are in stateVersion comparisons. This will ensure that existing user
configurations which refer to 21.03 will continue to work.
2021-02-12 14:12:48 -08:00
erictapen
b2dbb4f50e
nixos/mastodon: set environment for mastodon-init-dirs (#112917)
mastodon-init-dirs should have the same environment as the other
services, as it also calls rake. Especially RAILS_ENV was missing.
2021-02-12 20:31:44 +01:00
github-actions[bot]
0667f269fc
Merge staging-next into staging 2021-02-12 18:16:50 +00:00
Milan Pässler
4d6bfa473a
nixos/mastodon: init
Co-authored-by: Happy River <happyriver93@runbox.com>
Co-authored-by: ash lea <ashkitten@users.noreply.github.com>
Co-authored-by: Justin Humm <justin.humm@posteo.de>
2021-02-12 15:37:15 +00:00
github-actions[bot]
53c1035b44
Merge staging-next into staging 2021-02-12 12:20:24 +00:00
Florian Klink
53a0c2878b
Merge pull request #111786 from flokli/systemd-247.3
systemd: 247.2 -> 247.3
2021-02-12 12:52:49 +01:00
Michael Raskin
27f172ebd1
Merge pull request #112019 from 7c6f434c/fix-service-runner
nixos/service-runner: fix evaluation
2021-02-12 08:50:52 +00:00
Peter Hoeg
04e9e9e510 nixos/captive-browser: make it work without a fixed interface
nixpkgs-fmt makes this a lot noisier than it has to be
2021-02-12 14:35:51 +08:00
Mario Rodas
ffedd32f9f
Merge pull request #108511 from nagy/apache-lua-path-fix
nixos/httpd: fix lua paths
2021-02-11 20:04:42 -05:00
V
0268691925 nixos/localtime: make localtimed a system user
Currently, a user is created in the 1000-29999 range. This is incorrect,
as localtimed is a system service and not a user.
2021-02-11 22:36:37 +01:00
Jan Beinke
97718a3584
nixos/systemd-lib: allow mkIf in unitOption
`unitOption` is only used inside of `attrsOf` wich is perfectly capable of
handling the attrsets from `mkIf`, though the checkUnitConfig test
forbids it. This commit weakens that restriction to allow the usage of
`mkIf` inside of `systemd.services.<name>.serviceConfig.<something>`
etc.
2021-02-11 22:18:21 +01:00
Louis Blin
458fafa8fc nixos/prometheus-exporters/artifactory: init at 1.9.0
Adds a Prometheus exporter to scrape metrics from the API of JFrog
Artifactory instances.
2021-02-11 15:56:58 +00:00
Daniel Nagy
7c121e60c5
nixos/httpd: fix lua paths
Account for the fact that, when creating a lua package without the
"withPackages" helper, we dont get an extra "lua" attribute in the
package.

Therefore we need to distinguish between the "withPackages" case and the
direct ( or "empty" ) lua package.

For example with this nixos config:

```nix
{
  services.httpd = {
      enable = true;
      package = pkgs.apacheHttpd.override {
        luaSupport = true;
        lua5 = pkgs.lua5_3.withPackages (ps: with ps; [ luafilesystem ] );
      };
    };
}
```

Here we say that we want to have apache to use a lua, packaged with the
`luafilesystem` module so that we can `require` that in scripts to
render http responses. There, the set that gets assigned to `lua5 ` does
not have a `luaversion` attribute, rather it has a `lua` attribute
wherein lies a `luaversion` attribute. If we dont package additional
modules, then we dont have that `lua` attribute in between and rather
directly have to use `luaversion` directly.
2021-02-11 11:56:06 +01:00
Maciej Krüger
45b8e83128
qemu-vm: add virtualisation.fileSystems to allow extra vm mounts 2021-02-11 11:02:45 +01:00
Philipp Kern
8854b82511 nixos/spamassassin: Handle return codes correctly
For sa-update we care about two successful codes:

 * 1 -> no updates available: exit successfully
 * 0 -> updates have been installed: run sa-compile and pass
   through its return code
2021-02-11 10:12:16 +01:00
Philipp Kern
c86b339491 nixos/spamassassin: Only run sa-compile when updates have been installed 2021-02-11 10:12:15 +01:00
Philipp Kern
cc625c968d nixos/spamassassin: Run sa-compile after updating the rules
sa-compile speeds up processing the rules by compiling them from Perl to
C.  This needs to be run after every update and is saved in the local
state directory by Perl and SpamAssassin version.
2021-02-11 10:12:15 +01:00
Philipp Kern
624cc51bad nixos/spamassassin: Simplify services by using StateDirectory
Let systemd create SpamAssassin's state directory and populate it using the
regular updater service. Depend on the updater service on boot but do not
propagate failure to the main service.

spamd's commands to start and reload the service are still executed as
root but user/group are set to properly chown the state directory to the
target user. spamd drops privileges itself for its runner children but
preserves root on the main daemon (to listen and re-exec).
2021-02-11 10:09:45 +01:00
Philipp Kern
1db74d1150 nixos/spamassassin: Fix network requirement on boot
sa-update currently runs as part of the pre-start script of spamd. The
network is not guaranteed to be online at that point and even if we
were to depend on that, it makes the bootup brittle, as there is a
reliance on SpamAssassin's update server as a startup dependency on
boot.

Refactor the setup to move the pre-start script into its own unit.
This allows to perform the setup task only once. Continuous updates
are already done by sa-update.service triggered by sa-update.timer.
Only run sa-update in case /var/lib/spamassassin is empty.

While we are on it, let sa-update.service depend on the network being
online.
2021-02-11 10:09:45 +01:00
Ingo Blechschmidt
b481663125 nixos/whitebophir: expose new option provided by whitebophir 1.8.0 2021-02-10 23:33:02 +01:00
Linus Heckemann
e4cf0e7a45
Merge pull request #109345 from cole-h/zfs-closure
Shrink the ZFS closure by making mail support optional
2021-02-10 23:04:24 +01:00
Finn Behrens
92859ff489 nixos/prometheus-flow-exporter: init module 2021-02-10 14:29:05 +01:00
Robert Hensing
696294ea9f Improve todo 2021-02-10 10:36:00 +01:00
Robert Hensing
460ba46a4a nixos/hercules-ci-agent: Add myself to meta.maintainers 2021-02-10 09:50:27 +01:00
Robert Hensing
0c22957751 nixos/hercules-ci-agent: Improve concurrentTasks option doc 2021-02-10 09:49:57 +01:00
Robert Hensing
fbabab7b16 nixos/hercules-ci-agent: Format with nixpkgs-fmt 2021-02-10 09:49:21 +01:00
Aaron Andersen
9f9e7c181c nixos/nebula: conditionally provision the nebula user 2021-02-09 20:48:23 -05:00
Aaron Andersen
b52a8f67dd nixos/nebula: simply service user logic 2021-02-09 20:45:17 -05:00
Aaron Andersen
e8eaea9627 nixos/nebula: replace extraConfig option with a settings option 2021-02-09 20:42:33 -05:00
Aaron Andersen
5473527775
Merge pull request #111312 from fdietze/patch-2
herbstluftwm: Add option to specify package
2021-02-09 20:13:03 -05:00
Felix Dietze
5a827051aa herbstluftwm: Add option to specify package 2021-02-09 08:51:21 -01:00
Martin Weinelt
2b454fcefd
Merge pull request #112391 from serokell/zhenya/oauth2-proxy-multiple-hosts
nixos/oauth2_proxy_nginx: specify hostname in X-Auth-Request-Redirect
2021-02-09 02:37:03 +01:00
Bernardo Meurer
c83a3d6fa7
Merge pull request #112335 from lovesegfault/firefox-no-flash
treewide: cleanup Adobe Flash Player
2021-02-09 01:35:24 +00:00
Martin Weinelt
47901b544c
Merge pull request #111302 from fooker/pr/nginx-default-type
nixos/nginx: serve unknown MIME-Types as binary
2021-02-09 01:44:47 +01:00
Jan Tojnar
faf133f854
Merge pull request #97972 from mvnetbiz/power-profiles-daemon 2021-02-09 01:41:04 +01:00
Matt Votava
9a3190a960
power-profiles-daemon: init at 0.1, add service module 2021-02-09 01:25:56 +01:00