From 30a471535a3d3b24619adf80481c093f103ba446 Mon Sep 17 00:00:00 2001
From: Kalle Struik <kalle@kallestruik.nl>
Date: Mon, 12 May 2025 11:53:11 +0200
Subject: [PATCH] Fix services starting before ceph is mounted

---
 roles/forgejo-runner.nix | 4 ----
 roles/forgejo.nix        | 5 +++++
 roles/freshrss.nix       | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/roles/forgejo-runner.nix b/roles/forgejo-runner.nix
index 09155e5..3155977 100644
--- a/roles/forgejo-runner.nix
+++ b/roles/forgejo-runner.nix
@@ -48,10 +48,6 @@
             '';
           };
 
-          systemd.services.forgejo-secrets = {
-            after = [ "cephfs.mount" ];
-          };
-
           services.gitea-actions-runner = {
             package = pkgs.forgejo-actions-runner;
             instances.default = {
diff --git a/roles/forgejo.nix b/roles/forgejo.nix
index 7464dce..fdaad25 100644
--- a/roles/forgejo.nix
+++ b/roles/forgejo.nix
@@ -84,6 +84,11 @@
               forgejo-cli
             ];
 
+          # Make sure that ceph is mounted before trying to start forgejo
+          systemd.services.forgejo-secrets = {
+            after = [ "cephfs.mount" ];
+          };
+
           services.forgejo = {
             enable = true;
             package = pkgs.forgejo;
diff --git a/roles/freshrss.nix b/roles/freshrss.nix
index 9ff0318..9865ffc 100644
--- a/roles/freshrss.nix
+++ b/roles/freshrss.nix
@@ -81,6 +81,11 @@
           # Create the database
           postgres.databases = [ "freshrss" ];
 
+          # Make sure that ceph is mounted before trying to start freshrss
+          systemd.services.podman-freshrss = {
+            after = [ "cephfs.mount" ];
+          };
+
           podman.containers = {
             "freshrss" = {
               imageMetadata = dockerImages.freshrss;