From dd1c2b3cabc827b685f800a42ec5607ba2c748f5 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Thu, 15 Jun 2023 13:07:37 +0200
Subject: [PATCH] Rename deprecated options

---
 roles/server/gitea.nix | 8 +++++---
 roles/server/ssh.nix   | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/roles/server/gitea.nix b/roles/server/gitea.nix
index ae5cbb7..40c8cb9 100644
--- a/roles/server/gitea.nix
+++ b/roles/server/gitea.nix
@@ -5,10 +5,12 @@
 	services.gitea = {
 		enable = true;
 		# TODO: Make this not be hardcoded
-		rootUrl = "http://everest.local:3000";
 		settings = {
-			#server.SSH_PORT = 69;
-			service.DISABLE_REGISTRATION = lib.mkDefault true;
+			server = {
+				#server.SSH_PORT = 69;
+				DISABLE_REGISTRATION = lib.mkDefault true;
+				ROOT_URL = "http://everest.local:3000";
+			};
 		};
 	};
 	networking.firewall = {
diff --git a/roles/server/ssh.nix b/roles/server/ssh.nix
index fd19c30..576cd3b 100755
--- a/roles/server/ssh.nix
+++ b/roles/server/ssh.nix
@@ -3,8 +3,10 @@
 {
 	services.openssh = {
 		enable = true;
+		settings = {
+			PermitRootLogin = "no";
+			PasswordAuthentication = false;
+		};
 		startWhenNeeded = true;
-		permitRootLogin = "no"; 
-		passwordAuthentication = false;
 	};
 }