From b81c42034ba7aa19ff52ef5a11754ca3271d9292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 25 Oct 2024 16:33:21 -0300 Subject: [PATCH 1/3] docker: fix logging for bitbucket runner --- system/containers.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/system/containers.nix b/system/containers.nix index 19698e5..37844f7 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -12,6 +12,14 @@ "--volumes" ]; }; + daemon.settings = { + # needed by bitbucket runner ??? + log-driver = "json-file"; + log-opts = { + max-size = "10m"; + max-file = "3"; + }; + }; }; programs.extra-container.enable = true; From 9bc508f4a6a3daa263bb1c9edee187d6f1ea8737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 25 Oct 2024 16:43:20 -0300 Subject: [PATCH 2/3] scripts: update pint-fmt --- scripts/pint-fmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pint-fmt b/scripts/pint-fmt index 85ea6cd..4d84c88 100755 --- a/scripts/pint-fmt +++ b/scripts/pint-fmt @@ -1,6 +1,6 @@ #!/bin/sh -file="$(mktemp --tmpdir=/dev/shm).php" +file="$(mktemp)" cat - >"$file" ./vendor/bin/pint --quiet "$file" cat "$file" From 5bda7a8481d577210a096f48944577168e2c5f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Fri, 25 Oct 2024 16:43:53 -0300 Subject: [PATCH 3/3] ssh: include private configs --- user/ssh.nix | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/user/ssh.nix b/user/ssh.nix index 60649ba..4747bb4 100644 --- a/user/ssh.nix +++ b/user/ssh.nix @@ -1,26 +1,20 @@ -{ - config, - pkgs, - lib, - ... -}: -let - inherit (config.my) username mail; -in { config = { - programs.ssh.enable = true; - programs.ssh.matchBlocks = { - monolith = { - user = "lelgenio"; - hostname = "monolith.lelgenio.com"; - port = 9022; - }; - phantom = { - user = "root"; - hostname = "phantom.lelgenio.com"; - port = 9022; + programs.ssh = { + enable = true; + matchBlocks = { + monolith = { + user = "lelgenio"; + hostname = "monolith.lelgenio.com"; + port = 9022; + }; + phantom = { + user = "root"; + hostname = "phantom.lelgenio.com"; + port = 9022; + }; }; + includes = [ "~/Wopus/.ssh.config" ]; }; }; }