From 262d044229f172862b38dd2b7133e13278b5df85 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Thu, 11 May 2023 14:33:30 +0000
Subject: [PATCH] Upgrade linode

---
 hosts/linode/default.nix   |  1 +
 hosts/linode/git.nix       |  6 ++++--
 hosts/linode/nextcloud.nix |  2 +-
 hosts/linode/rei.nix       | 15 +++++++++++++++
 modules-all/default.nix    |  7 ++++++-
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 hosts/linode/rei.nix

diff --git a/hosts/linode/default.nix b/hosts/linode/default.nix
index fe846a6..8273b98 100644
--- a/hosts/linode/default.nix
+++ b/hosts/linode/default.nix
@@ -8,6 +8,7 @@
 		./nextcloud.nix
 		./nginx.nix
 		./postgres.nix
+		./rei.nix
 		./synapse.nix
 	];
 	greg.home = false;
diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix
index 235cf55..ac6ab42 100644
--- a/hosts/linode/git.nix
+++ b/hosts/linode/git.nix
@@ -34,7 +34,9 @@ in {
 			enable = true;
 			type = "tar.xz";
 		};
-		httpPort = 3001;
+		settings = {
+			server.HTTP_PORT = 3001;
+		};
 		log = {
 			level = "Info";
 		};
@@ -42,7 +44,7 @@ in {
 	};
 
 	greg.proxies."${srcDomain}" = {
-		target = "http://localhost:${toString config.services.gitea.httpPort}";
+		target = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}";
 		ssl = true;
 		genAliases = false;
 	};
diff --git a/hosts/linode/nextcloud.nix b/hosts/linode/nextcloud.nix
index 143485a..6652f68 100644
--- a/hosts/linode/nextcloud.nix
+++ b/hosts/linode/nextcloud.nix
@@ -6,7 +6,7 @@
 
 	services.nextcloud = {
 		enable = true;
-		package = pkgs.nextcloud24;
+		package = pkgs.nextcloud25;
 		appstoreEnable = true;
 		hostName = "next.${config.networking.domain}";
 		https = true;
diff --git a/hosts/linode/rei.nix b/hosts/linode/rei.nix
new file mode 100644
index 0000000..24e5a26
--- /dev/null
+++ b/hosts/linode/rei.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+	services = {
+		odoo = {
+			enable = true;
+			domain = "doublel.thehellings.com";
+			settings.options = {
+				db_host = "localhost";
+				db_port = "5432";
+				db_user = "odoo";
+				dbfilter = "^doublel.*$";
+			};
+		};
+	};
+}
diff --git a/modules-all/default.nix b/modules-all/default.nix
index 73c0ef3..7e64ddd 100644
--- a/modules-all/default.nix
+++ b/modules-all/default.nix
@@ -32,7 +32,12 @@
 		};
 	};
 
-	nixpkgs.config.allowUnfree = true;
+	nixpkgs.config = {
+		allowUnfree = true;
+		permittedInsecurePackages = [
+			"qtwebkit-5.212.0-alpha4"
+		];
+	};
 
 	# Base packages that need to be in all my hosts
 	environment.systemPackages = with pkgs; [