From 262d044229f172862b38dd2b7133e13278b5df85 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 11 May 2023 14:33:30 +0000 Subject: [PATCH 1/5] 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; [ From 18c165663d524f19369b8a6aada4f7ad49febedb Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 29 May 2023 02:42:37 +0000 Subject: [PATCH 2/5] Upgrade stable to 23.05 --- flake.lock | 8 ++++---- flake.nix | 2 +- hosts/linode/git.nix | 9 +++------ hosts/linode/nextcloud.nix | 1 + hosts/linode/postgres.nix | 6 ++---- modules-all/default.nix | 1 + overlays/default.nix | 3 +-- 7 files changed, 13 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 87be1c7..459f21f 100644 --- a/flake.lock +++ b/flake.lock @@ -158,16 +158,16 @@ }, "nixstable": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1685094109, + "narHash": "sha256-u+awry81RAVV+fJBCZt+GKWsISSLJKUNbVwKccHeaPU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "551a52bfdd02e7b75be5faf9b42f864112d88654", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0491756..c89eae0 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ description = "Greg's machines!"; inputs = { - nixstable.url = "github:nixos/nixpkgs/nixos-22.05"; + nixstable.url = "github:nixos/nixpkgs/nixos-23.05"; nixunstable.url = "github:nixos/nixpkgs/nixos-unstable"; agenix.url = "github:ryantm/agenix"; flake-utils.url = "github:numtide/flake-utils"; diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix index ac6ab42..520a2ea 100644 --- a/hosts/linode/git.nix +++ b/hosts/linode/git.nix @@ -23,22 +23,19 @@ in { services.gitea = rec { enable = true; appName = "Greg's Sources"; - cookieSecure = true; database = { type = "postgres"; user = "gitea"; }; - disableRegistration = true; domain = srcDomain; dump = { enable = true; type = "tar.xz"; }; settings = { - server.HTTP_PORT = 3001; - }; - log = { - level = "Info"; + service.DISABLE_REGISTRATION = pkgs.lib.mkForce true; + session.COOKIE_SECURE = pkgs.lib.mkForce true; + log.level = "Info"; }; rootUrl = "https://${domain}/"; }; diff --git a/hosts/linode/nextcloud.nix b/hosts/linode/nextcloud.nix index 6652f68..fdf2e5e 100644 --- a/hosts/linode/nextcloud.nix +++ b/hosts/linode/nextcloud.nix @@ -9,6 +9,7 @@ package = pkgs.nextcloud25; appstoreEnable = true; hostName = "next.${config.networking.domain}"; + #enableBrokenCiphersForSSE = false; https = true; config = { adminpassFile = config.age.secrets.nextcloudadmin.path; diff --git a/hosts/linode/postgres.nix b/hosts/linode/postgres.nix index 497edd1..31a710f 100644 --- a/hosts/linode/postgres.nix +++ b/hosts/linode/postgres.nix @@ -53,10 +53,8 @@ root root postgres postgresLog = { enable = true; files = "/var/lib/postgresql/*/log/*.log"; - extraConfig = (lib.strings.concatStringsSep "\n" [ - "compress" - "compresscmd=${pkgs.xz}/bin/xz" - ]); + compress = true; + compresscmd = "${pkgs.xz}/bin/xz"; }; }; }; diff --git a/modules-all/default.nix b/modules-all/default.nix index 7e64ddd..6afc462 100644 --- a/modules-all/default.nix +++ b/modules-all/default.nix @@ -36,6 +36,7 @@ allowUnfree = true; permittedInsecurePackages = [ "qtwebkit-5.212.0-alpha4" + "openssl-1.1.1t" ]; }; diff --git a/overlays/default.nix b/overlays/default.nix index ce5becf..8af1cf8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -50,8 +50,7 @@ let }); in rec { - #gitea = super.unstable.gitea; - + #python3 = self.unstable.python3; gregpy = myPython; my-py-addons = rec { From 5ea87c7d9d8d98bcd7aebbcd3837d26ea7517aec Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 29 May 2023 03:38:49 +0000 Subject: [PATCH 3/5] Upgrade nextcloud to 26 --- hosts/linode/nextcloud.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/linode/nextcloud.nix b/hosts/linode/nextcloud.nix index fdf2e5e..e257606 100644 --- a/hosts/linode/nextcloud.nix +++ b/hosts/linode/nextcloud.nix @@ -6,10 +6,10 @@ services.nextcloud = { enable = true; - package = pkgs.nextcloud25; + package = pkgs.nextcloud26; appstoreEnable = true; hostName = "next.${config.networking.domain}"; - #enableBrokenCiphersForSSE = false; + enableBrokenCiphersForSSE = false; https = true; config = { adminpassFile = config.age.secrets.nextcloudadmin.path; From 262d754afd4143aaba11fce1b295d36951d22a1a Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 29 May 2023 03:41:58 +0000 Subject: [PATCH 4/5] Remove Gitea deprecation warnings --- hosts/linode/git.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix index 520a2ea..804271c 100644 --- a/hosts/linode/git.nix +++ b/hosts/linode/git.nix @@ -27,17 +27,19 @@ in { type = "postgres"; user = "gitea"; }; - domain = srcDomain; dump = { enable = true; type = "tar.xz"; }; settings = { + server = rec { + ROOT_URL = "https://${DOMAIN}/"; + DOMAIN = srcDomain; + }; service.DISABLE_REGISTRATION = pkgs.lib.mkForce true; session.COOKIE_SECURE = pkgs.lib.mkForce true; log.level = "Info"; }; - rootUrl = "https://${domain}/"; }; greg.proxies."${srcDomain}" = { From c2af4a5e9dd1a6b9c839f7cc737f901f09c543e2 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 29 May 2023 03:43:00 +0000 Subject: [PATCH 5/5] Remove unsafe package exception --- modules-all/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules-all/default.nix b/modules-all/default.nix index 6afc462..7e64ddd 100644 --- a/modules-all/default.nix +++ b/modules-all/default.nix @@ -36,7 +36,6 @@ allowUnfree = true; permittedInsecurePackages = [ "qtwebkit-5.212.0-alpha4" - "openssl-1.1.1t" ]; };