ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-08-16 02:30:42 +03:00
Code Issues Projects Releases Wiki Activity

nixos/atuin: fix database.createLocally behaviour

Browse Source 
Co-authored-by: Andrew Marshall <andrew@johnandrewmarshall.com>
This commit is contained in:
h7x4 2023-07-26 22:20:53 +02:00 committed by Yt
parent 025b5d4875
commit fd01b3f59c
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
nixos/modules/services/misc/atuin.nix
View File

@ -1,14 +1,12 @@
{ config, pkgs, lib, ... }:
with lib;
let
inherit (lib) mkOption types mdDoc mkIf;
cfg = config.services.atuin;
in
{
options = {
services.atuin = {
enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin");
enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin");
openRegistration = mkOption {
type = types.bool;
@ -50,16 +48,28 @@ in
createLocally = mkOption {
type = types.bool;
default = true;
description = lib.mdDoc "Create the database and database user locally.";
description = mdDoc "Create the database and database user locally.";
};
uri = mkOption {
type = types.str;
default = "postgresql:///atuin?host=/run/postgresql";
example = "postgresql://atuin@localhost:5432/atuin";
description = mdDoc "URI to the database";
};
};
};
};
config = mkIf cfg.enable {
assertions = [
{
assertion = cfg.database.createLocally -> config.services.postgresql.enable;
message = "Postgresql must be enabled to create a local database";
}
];
# enable postgres to host atuin db
services.postgresql = {
services.postgresql = mkIf cfg.database.createLocally {
enable = true;
ensureUsers = [{
name = "atuin";
@ -73,7 +83,7 @@ in
systemd.services.atuin = {
description = "atuin server";
requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];
after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ] ;
after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
@ -87,14 +97,13 @@ in
ATUIN_HOST = cfg.host;
ATUIN_PORT = toString cfg.port;
ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;
ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration;
ATUIN_DB_URI = mkIf cfg.database.createLocally "postgresql:///atuin";
ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration;
ATUIN_DB_URI = cfg.database.uri;
ATUIN_PATH = cfg.path;
ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables
};
};
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
};
}

2
nixos/tests/atuin.nix
View File

@ -14,6 +14,8 @@ in
server =
{ ... }:
{
services.postgresql.enable = true;
services.atuin = {
enable = true;
port = testPort;