diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-03-19 17:30:09 +0100 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-03-19 17:30:16 +0100 |
commit | 77624624058066a324c1ff2ff464b53f43de4b0c (patch) | |
tree | e27cab16dba775f25a870b91f07aa6284d674e9c /nixos/modules | |
parent | 0b369088d7534278bd67cf848fe30b786895faf3 (diff) | |
parent | a5bee07d3f2cb750f99b1514ac06cf097dce3a98 (diff) | |
download | nixlib-77624624058066a324c1ff2ff464b53f43de4b0c.tar nixlib-77624624058066a324c1ff2ff464b53f43de4b0c.tar.gz nixlib-77624624058066a324c1ff2ff464b53f43de4b0c.tar.bz2 nixlib-77624624058066a324c1ff2ff464b53f43de4b0c.tar.lz nixlib-77624624058066a324c1ff2ff464b53f43de4b0c.tar.xz nixlib-77624624058066a324c1ff2ff464b53f43de4b0c.tar.zst nixlib-77624624058066a324c1ff2ff464b53f43de4b0c.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/flask-security-too/default.nix
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 11 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/hedgedoc.nix | 8 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/budgie.nix | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index ec347a75f063..e95ab0a112bc 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1439,6 +1439,8 @@ in { nodejs gnupg + "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq-${cfg.packages.gitlab.rubyEnv.gems.sidekiq.version}" + # Needed for GitLab project imports gnutar gzip @@ -1452,7 +1454,12 @@ in { TimeoutSec = "infinity"; Restart = "always"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; - ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production"; + ExecStart = utils.escapeSystemdExecArgs [ + "${cfg.packages.gitlab}/share/gitlab/bin/sidekiq-cluster" + "-e" "production" + "-r" "." + "*" # all queue groups + ]; }; }; @@ -1550,7 +1557,7 @@ in { gnutar gzip openssh - gitlab-workhorse + cfg.packages.gitlab-workhorse ]; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index adcfe80a7332..8b17c6cbc3be 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -236,9 +236,9 @@ in }; services.hedgedoc.settings = { - defaultNotePath = lib.mkDefault "${cfg.package}/public/default.md"; - docsPath = lib.mkDefault "${cfg.package}/public/docs"; - viewPath = lib.mkDefault "${cfg.package}/public/views"; + defaultNotePath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/default.md"; + docsPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/docs"; + viewPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/views"; }; systemd.services.hedgedoc = { @@ -263,7 +263,7 @@ in Group = name; Restart = "always"; - ExecStart = "${cfg.package}/bin/hedgedoc"; + ExecStart = lib.getExe cfg.package; RuntimeDirectory = [ name ]; StateDirectory = [ name ]; WorkingDirectory = "/run/${name}"; diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 7d8bb1963d78..dfc5450d1c81 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -44,6 +44,8 @@ let enableSshSocket = config.services.openssh.startWhenNeeded; }; in { + meta.maintainers = lib.teams.budgie.members; + options = { services.xserver.desktopManager.budgie = { enable = mkEnableOption (mdDoc "the Budgie desktop"); |