From 299a4e4b362a1fce3e148439670f93f602d401bd Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Tue, 30 May 2023 15:36:25 +0200
Subject: [PATCH] Updates

---
 machines/drone/configuration.nix | 5 ++++-
 machines/gitea/configuration.nix | 5 ++++-
 machines/proxy/configuration.nix | 1 -
 modules/gitea/default.nix        | 7 +++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/machines/drone/configuration.nix b/machines/drone/configuration.nix
index 8fbaddf..a946023 100644
--- a/machines/drone/configuration.nix
+++ b/machines/drone/configuration.nix
@@ -7,7 +7,10 @@
   ];
 
   eboskma = {
-    users.erwin.enable = true;
+    users.erwin = {
+      enable = true;
+      server = true;
+    };
     docker.enable = true;
     drone.enable = true;
     nix-common = {
diff --git a/machines/gitea/configuration.nix b/machines/gitea/configuration.nix
index 7e340a5..3342d2c 100644
--- a/machines/gitea/configuration.nix
+++ b/machines/gitea/configuration.nix
@@ -9,7 +9,10 @@
   ];
 
   eboskma = {
-    users.erwin.enable = true;
+    users.erwin = {
+      enable = true;
+      server = true;
+    };
     gitea.enable = true;
     nix-common = {
       enable = true;
diff --git a/machines/proxy/configuration.nix b/machines/proxy/configuration.nix
index 35aa25d..0c64604 100644
--- a/machines/proxy/configuration.nix
+++ b/machines/proxy/configuration.nix
@@ -2,7 +2,6 @@
 { modulesPath, ... }: {
   imports = [
     (modulesPath + "/virtualisation/proxmox-lxc.nix")
-    ./hardware-configuration.nix
     ../../users/root
     ../../users/erwin
   ];
diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix
index 20a32c7..0b57add 100644
--- a/modules/gitea/default.nix
+++ b/modules/gitea/default.nix
@@ -14,9 +14,7 @@ in
     services.gitea = {
       enable = true;
       user = "git";
-      domain = "git.datarift.nl";
       appName = "Gitea Datarift";
-      rootUrl = "https://git.datarift.nl/";
       lfs = {
         enable = true;
       };
@@ -46,6 +44,11 @@ in
           ENABLE_PUSH_CREATE_ORG = true;
         };
 
+        server = {
+          DOMAIN = "git.datarift.nl";
+          ROOT_URL = "https://git.datarift.nl/";
+        };
+
         service = {
           DEFAULT_KEEP_EMAIL_PRIVATE = true;
           DISABLE_REGISTRATION = true;