diff --git a/hosts/linode/default.nix b/hosts/linode/default.nix index 10ea308..8273b98 100644 --- a/hosts/linode/default.nix +++ b/hosts/linode/default.nix @@ -5,7 +5,6 @@ ./git.nix ./hardware-configuration.nix ./podman.nix - ./monica.nix ./nextcloud.nix ./nginx.nix ./postgres.nix diff --git a/hosts/linode/monica.nix b/hosts/linode/monica.nix deleted file mode 100644 index f2f221b..0000000 --- a/hosts/linode/monica.nix +++ /dev/null @@ -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"; - }; -} diff --git a/hosts/linode/rei.nix b/hosts/linode/rei.nix index 24e5a26..55b3ab7 100644 --- a/hosts/linode/rei.nix +++ b/hosts/linode/rei.nix @@ -1,15 +1,27 @@ -{ ... }: +{ config, ... }: { - services = { - odoo = { - enable = true; - domain = "doublel.thehellings.com"; - settings.options = { - db_host = "localhost"; - db_port = "5432"; - db_user = "odoo"; - dbfilter = "^doublel.*$"; - }; + 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"; + }; } diff --git a/modules-all/default.nix b/modules-all/default.nix index 3871f4c..5bfd994 100644 --- a/modules-all/default.nix +++ b/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