From 4724e334bd969078d86c39b28e67cdd9f97db367 Mon Sep 17 00:00:00 2001 From: Ashhhleyyy Date: Tue, 4 Jun 2024 11:58:25 +0100 Subject: [PATCH] feat(lea): more tweaks --- hosts/lea/configuration.nix | 15 +++------------ roles/postgres.nix | 30 ++++++++++++++++++++++++++---- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/hosts/lea/configuration.nix b/hosts/lea/configuration.nix index 2e1ae0d..c061b99 100644 --- a/hosts/lea/configuration.nix +++ b/hosts/lea/configuration.nix @@ -14,6 +14,8 @@ boot.loader.grub.device = "/dev/sdb"; boot.loader.grub.useOSProber = true; + services.smartd.enable = true; + networking.hostName = "lea"; networking.networkmanager.enable = true; @@ -22,18 +24,6 @@ i18n.defaultLocale = "en_GB.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_GB.UTF-8"; - LC_IDENTIFICATION = "en_GB.UTF-8"; - LC_MEASUREMENT = "en_GB.UTF-8"; - LC_MONETARY = "en_GB.UTF-8"; - LC_NAME = "en_GB.UTF-8"; - LC_NUMERIC = "en_GB.UTF-8"; - LC_PAPER = "en_GB.UTF-8"; - LC_TELEPHONE = "en_GB.UTF-8"; - LC_TIME = "en_GB.UTF-8"; - }; - services.xserver = { layout = "gb"; xkbVariant = ""; @@ -54,6 +44,7 @@ environment.systemPackages = with pkgs; [ helix + smartmontools ]; services.openssh.enable = true; diff --git a/roles/postgres.nix b/roles/postgres.nix index f3dddb2..c5bde81 100644 --- a/roles/postgres.nix +++ b/roles/postgres.nix @@ -1,16 +1,38 @@ { config, pkgs, ... }: { services.postgresql = { enable = true; + package = pkgs.postgresql_14; + settings = { + max_connections = 200; + shared_buffers = "768MB"; + effective_cache_size = "2304MB"; + maintenance_work_mem = "192MB"; + checkpoint_completion_target = 0.9; + wal_buffers = "16MB"; + default_statistics_target = 100; + random_page_cost = 4; + effective_io_concurrency = 2; + work_mem = "1966kB"; + huge_pages = false; + min_wal_size = "1GB"; + max_wal_size = "4GB"; + max_worker_processes = 4; + max_parallel_workers_per_gather = 2; + max_parallel_workers = 4; + max_parallel_maintenance_workers = 2; + }; ensureDatabases = [ "shorks-gay" ]; enableTCPIP = true; dataDir = "/data/postgresql/${config.services.postgresql.package.psqlSchema}"; authentication = pkgs.lib.mkOverride 10 '' - #type database DBuser origin-address auth-method + #type database DBuser auth-method + local all all peer + #type database DBuser origin-address auth-method # ipv4 - host all all 127.0.0.1/32 trust - host all all 100.64.0.0/10 trust + host all all 127.0.0.1/32 scram-sha-256 + host all all 100.64.0.0/10 scram-sha-256 # ipv6 - host all all ::1/128 trust + host all all ::1/128 scram-sha-256 ''; }; }