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,9 +14,7 @@ in {
       ];
     });
 
-    # use postgres, will create and start postgresql
-    # itself, as well as databdase and user
-    database.type = "postgres";
+    stateDir = config.mine.zfsMounts."rpool/safe/svcs/forgejo";
 
     settings = {
       server = {

machines/gerd/services/nextcloud.nix

@@ -152,11 +152,6 @@ 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
@@ -198,6 +193,11 @@ 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,11 +217,6 @@ 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;