From 5a48cedb58c1d740166d19af95cc346697122c67 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Sat, 24 Aug 2024 22:18:05 +0200
Subject: [PATCH 1/2] gerd.forgejo: moved to postgresql instead of sqlite

---
 machines/gerd/services/forgejo/forgejo.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/machines/gerd/services/forgejo/forgejo.nix b/machines/gerd/services/forgejo/forgejo.nix
index 1ea2383..eb6e0b8 100644
--- a/machines/gerd/services/forgejo/forgejo.nix
+++ b/machines/gerd/services/forgejo/forgejo.nix
@@ -2,10 +2,10 @@
 
 let
   svc_domain = "git.${config.mine.shared.settings.domain}";
-
 in {
   services.forgejo = {
     enable = true;
+    stateDir = config.mine.zfsMounts."rpool/safe/svcs/forgejo";
 
     package = pkgs.forgejo.overrideAttrs (old: {
       patches = old.patches ++ [
@@ -14,7 +14,9 @@ in {
       ];
     });
 
-    stateDir = config.mine.zfsMounts."rpool/safe/svcs/forgejo";
+    # use postgres, will create and start postgresql
+    # itself, as well as databdase and user
+    database.type = "postgres";
 
     settings = {
       server = {

From 866f8b1b908576676ab07f13ae12790176e19df6 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Sat, 24 Aug 2024 22:18:33 +0200
Subject: [PATCH 2/2] gerd.nextcloud: moved to postgresql instead of sqlite

---
 machines/gerd/services/nextcloud.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/machines/gerd/services/nextcloud.nix b/machines/gerd/services/nextcloud.nix
index 5c0d230..14184df 100644
--- a/machines/gerd/services/nextcloud.nix
+++ b/machines/gerd/services/nextcloud.nix
@@ -152,6 +152,11 @@ in {
     # secrets
     secretFile = config.age.secrets.nextcloud-secrets.path;
 
+    # use postgresql for database
+    # createLocally will enable postgresql, add database and user
+    database.createLocally = true;
+    config.dbtype = "pgsql";
+
     # settings
     settings = {
       # open connect/oidc
@@ -193,11 +198,6 @@ in {
     serviceConfig.RemainAfterExit = true;
   };
 
-  # ensure that nextcloud can access stateDir
-  systemd.tmpfiles.rules = [
-    "Z ${stateDir} 6770 ${nextcloud_user} ${nextcloud_group} -"
-  ];
-
   # setup authelia for nextcloud
   services.authelia.instances.main.settings.identity_providers.oidc.clients = [{
     client_id = AUTHELIA_AUTH_NAME;
@@ -217,6 +217,11 @@ in {
     enableACME = true;
   };
 
+  # ensure that nextcloud can access stateDir
+  systemd.tmpfiles.rules = [
+    "Z ${stateDir} 6770 ${nextcloud_user} ${nextcloud_group} -"
+  ];
+
   age.secrets = {
     nextcloud-admin-pass.owner = nextcloud_user;
     nextcloud-secrets.owner = nextcloud_user;