Move Monica to REI

hosts/linode/default.nix

@@ -5,7 +5,6 @@
 		./git.nix
 		./hardware-configuration.nix
 		./podman.nix
-		./monica.nix
 		./nextcloud.nix
 		./nginx.nix
 		./postgres.nix

hosts/linode/monica.nix

@@ -1,28 +0,0 @@
-{ config, ... }:
-
-{
-	services.monica = {
-		enable = true;
-		appKeyFile = config.age.secrets.monica.path;
-		appURL = "https://people.thehellings.com";
-		database = {
-			port = 5432;
-		};
-		nginx = {
-			addSSL = true;
-			enableACME = true;
-			serverAliases = [ "people.thehellings.com" ];
-		};
-	};
-
-	age.secrets.monica = {
-		file = ../../secrets/monica.age;
-		owner = "monica";
-	};
-
-	greg.backup.jobs.monica = {
-		src = "/var/lib/monica";
-		dest = "monica";
-		user = "monica";
-	};
-}

hosts/linode/rei.nix

@@ -1,15 +1,27 @@
-{ ... }:
+{ config, ... }:
 {
-	services = {
+	services.monica = {
-		odoo = {
 		enable = true;
-			domain = "doublel.thehellings.com";
+		appKeyFile = config.age.secrets.monica.path;
-			settings.options = {
+		appURL = "https://people.thehellings.com";
-				db_host = "localhost";
+		database = {
-				db_port = "5432";
+			port = 5432;
-				db_user = "odoo";
+		};
-				dbfilter = "^doublel.*$";
+		nginx = {
+			addSSL = true;
+			enableACME = true;
+			serverAliases = [ "people.thehellings.com" ];
 		};
 	};
+
+	age.secrets.monica = {
+		file = ../../secrets/monica.age;
+		owner = "monica";
+	};
+
+	greg.backup.jobs.monica = {
+		src = "/var/lib/monica";
+		dest = "monica";
+		user = "monica";
 	};
 }

modules-all/default.nix

@@ -41,9 +41,6 @@
 
 	nixpkgs.config = {
 		allowUnfree = true;
-		permittedInsecurePackages = [
-			"qtwebkit-5.212.0-alpha4"
-		];
 	};
 
 	# Base packages that need to be in all my hosts