Merge branch 'fc-22.11-dev' into fc-22.11-staging

flyingcircusio · May 11, 2023 · b0e6f96 · b0e6f96
2 parents 493bdda + ba6816b
commit b0e6f96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/nixos/platform/collect-garbage-userscan.exclude b/nixos/platform/collect-garbage-userscan.exclude
@@ -10,6 +10,7 @@
 **/journal/
 **/lucene/
 **/solr/data/
+**/nixpkgs-*/
 # Files in sub-directories to ignore (anywhere in the home directory)
 **/.local/share/fish/fish_history
 **/diagnostic.data/metrics.*

diff --git a/nixos/roles/gitlab.nix b/nixos/roles/gitlab.nix
@@ -218,6 +218,12 @@ in
     # Needed for Git via SSH.
     users.users.gitlab.extraGroups = [ "login" ];
 
+    # ensure that gitlab is restarted again, when stopped due to a dependency
+    # (e.g. postgresql) being stopped and started again
+    systemd.services.gitlab = {
+      wantedBy = lib.mkForce [];
+      requiredBy = [ "gitlab.target" ];
+    };
   })
 
   (lib.mkIf (cfg.enable && cfg.extraSecrets != []) {