Merge master into staging-next

This commit is contained in:
github-actions[bot]
2023-06-03 12:01:39 +00:00
committed by GitHub
36 changed files with 2704 additions and 3041 deletions

View File

@@ -498,7 +498,8 @@ in
systemd.services.gitea = {
description = "gitea";
after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service";
after = [ "network.target" ] ++ optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
requires = optional usePostgresql "postgresql.service" ++ optional useMysql "mysql.service";
wantedBy = [ "multi-user.target" ];
path = [ cfg.package pkgs.git pkgs.gnupg ];