From 60577ad4ea79004cbdd42228dc1fdca0a4705942 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 10 Dec 2022 15:15:11 +0100
Subject: [PATCH] renge/gitea: Migrate to 22.11 options

---
 machines/renge/services/gitea.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/machines/renge/services/gitea.nix b/machines/renge/services/gitea.nix
index 6a507c1..d330a07 100644
--- a/machines/renge/services/gitea.nix
+++ b/machines/renge/services/gitea.nix
@@ -14,15 +14,10 @@ in
 
     rootUrl = "https://git.sbruder.de/";
     appName = "sbrudergit";
-    cookieSecure = true;
-    log.level = "Warn";
     lfs = {
       enable = true;
     };
     enableUnixSocket = true;
-    ssh = {
-      clonePort = 2022;
-    };
     database.type = "postgres";
     mailerPasswordFile = config.sops.secrets.gitea-mail.path;
     settings = {
@@ -43,6 +38,7 @@ in
         # internal ssh server
         BUILTIN_SSH_SERVER_USER = "git";
         START_SSH_SERVER = true;
+        SSH_PORT = 2022;
         SSH_SERVER_HOST_KEYS = "ssh/gitea.ed25519,ssh/gitea.rsa";
       };
       service = {
@@ -53,11 +49,15 @@ in
       };
       session = {
         PROVIDER = "file";
+        COOKIE_SECURE = true;
+      };
+      log = {
+        LEVEL = "Warn";
       };
     };
   };
 
-  networking.firewall.allowedTCPPorts = [ cfg.ssh.clonePort ];
+  networking.firewall.allowedTCPPorts = [ cfg.settings.server.SSH_PORT ];
 
   services.nginx.virtualHosts."git.sbruder.de" = {
     enableACME = true;