From 9e59a65d920e0e2aa23c5cf1b98fe32860b42422 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 15 Jun 2021 15:54:46 +0200 Subject: repo-sync: isSystemUser --- krebs/3modules/repo-sync.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs') diff --git a/krebs/3modules/repo-sync.nix b/krebs/3modules/repo-sync.nix index f9877c0f..0312c62f 100644 --- a/krebs/3modules/repo-sync.nix +++ b/krebs/3modules/repo-sync.nix @@ -149,6 +149,7 @@ let inherit (cfg.user) home name uid; createHome = true; description = "repo-sync user"; + isSystemUser = true; }; systemd.timers = mapAttrs' (name: repo: -- cgit v1.2.3 From 8949b2ad3613e39fd47762ab839e6a9b6178cf1b Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 16 Jun 2021 14:01:35 +0200 Subject: external: add ed25519 pubkey of makanek.r --- krebs/3modules/external/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs') diff --git a/krebs/3modules/external/default.nix b/krebs/3modules/external/default.nix index c6225aaa..75be5832 100644 --- a/krebs/3modules/external/default.nix +++ b/krebs/3modules/external/default.nix @@ -220,6 +220,7 @@ in { Ya8buh4RgyE/0hp4QNpa4K7fvntriK+k6zHs7BcZcG2aMWP3O9/4DgjzBR3eslQV oou23ajP11wyfrmZK0/PQGTpsU472Jj+06KtMAaH0zo4vAR8s2kV1ukCAwEAAQ== -----END RSA PUBLIC KEY----- + Ed25519PublicKey = s/HNXjzVyDiBZImQdhJqUmj7symv+po9D9uDj+/6c2F ''; }; }; -- cgit v1.2.3 From 985ba7c82d3400de322bfa2de7a82349e080f114 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 18 Jun 2021 19:05:47 +0200 Subject: nixpkgs: 1f91fd1 -> bad3ccd --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 429c23cf..37cee658 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "1f91fd1040667e9265a760b0347f8bc416249da7", - "date": "2021-06-13T11:32:41+02:00", - "path": "/nix/store/8cx16mc5cymv2ll52fs831lmd4ljzmq1-nixpkgs", - "sha256": "1lcfcwgal9fpaiq71981abyzz160r6nx1y4pyy1dnvaf951xkdcj", + "rev": "bad3ccd099ebe9a8aa017bda8500ab02787d90aa", + "date": "2021-06-17T20:20:32+00:00", + "path": "/nix/store/2m29isga2dff5x2dzyyr3dql9jpwf5kk-nixpkgs", + "sha256": "07ik6rcfpcvj2zch3mzkxwxjs817iysbvsydkm85f14kn7gnyzp5", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 81aef5ba96dbc3bfff4c4f91720b0de810df84a9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 25 Jun 2021 21:10:34 +0200 Subject: nixpkgs: bad3ccd -> 8112fbe --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 37cee658..148ef258 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "bad3ccd099ebe9a8aa017bda8500ab02787d90aa", - "date": "2021-06-17T20:20:32+00:00", - "path": "/nix/store/2m29isga2dff5x2dzyyr3dql9jpwf5kk-nixpkgs", - "sha256": "07ik6rcfpcvj2zch3mzkxwxjs817iysbvsydkm85f14kn7gnyzp5", + "rev": "8112fbe212f6086151acb19fe464b00c8ac1aebd", + "date": "2021-06-24T18:13:28-07:00", + "path": "/nix/store/6srgmm1rcvl4d0551f5r1czg7l4qjwmr-nixpkgs", + "sha256": "1224ikia2vm2ar6021fr7apkvn5vdpd8qxj0lw068ph5vl3mb7i8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From e46879d2c18ec89319bc976bb2728311bf60538f Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 25 Jun 2021 21:12:03 +0200 Subject: nixpkgs-unstable: fbfb794 -> 1905f5f --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index aaf66e42..8ee3996f 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94", - "date": "2021-06-06T04:54:09-03:00", - "path": "/nix/store/51dsmanfc179xy70kn2rl0qvg45cn6qr-nixpkgs", - "sha256": "0pgyx1l1gj33g5i9kwjar7dc3sal2g14mhfljcajj8bqzzrbc3za", + "rev": "1905f5f2e55e0db0bb6244cfe62cb6c0dbda391d", + "date": "2021-06-23T13:30:53+02:00", + "path": "/nix/store/4d13w00xgnn261zlnr34kb8xx908d4h2-nixpkgs", + "sha256": "148f79hhya66qj8v5gn7bs6zrfjy1nbvdciyxdm4yd5p8r6ayzv6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 80319eb0d207e4b1540a39f76d3cb34de719cef1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Jun 2021 11:46:48 +0200 Subject: nixpkgs: 8112fbe -> 71326cd --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 148ef258..a8e071ff 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "8112fbe212f6086151acb19fe464b00c8ac1aebd", - "date": "2021-06-24T18:13:28-07:00", - "path": "/nix/store/6srgmm1rcvl4d0551f5r1czg7l4qjwmr-nixpkgs", - "sha256": "1224ikia2vm2ar6021fr7apkvn5vdpd8qxj0lw068ph5vl3mb7i8", + "rev": "71326cd12ddfa0fac40fdb451fcba7dad763c56e", + "date": "2021-06-29T09:31:02+02:00", + "path": "/nix/store/110psm19cnca2l4lg966fd3vj7q57yhj-nixpkgs", + "sha256": "1939fwll9xwm7mf5crz7gfvz41c8gqd8wg7fy2v6m71viiq8lrda", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 6fb30b6ace819cf6407f9175978f08aba2819169 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 30 Jun 2021 11:47:18 +0200 Subject: nixpkgs-unstable: 1905f5f -> 3a8d795 --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 8ee3996f..bd55fb50 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "1905f5f2e55e0db0bb6244cfe62cb6c0dbda391d", - "date": "2021-06-23T13:30:53+02:00", - "path": "/nix/store/4d13w00xgnn261zlnr34kb8xx908d4h2-nixpkgs", - "sha256": "148f79hhya66qj8v5gn7bs6zrfjy1nbvdciyxdm4yd5p8r6ayzv6", + "rev": "3a8d7958a610cd3fec3a6f424480f91a1b259185", + "date": "2021-06-29T00:13:55+01:00", + "path": "/nix/store/j84n03gc032s1hf27piw86b4kskd37ch-nixpkgs", + "sha256": "0bmxrdn9sn6mxvkyyxdlxlzczfh59iy66c55ql144ilc1cjk28is", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From b4fcff65c514b1282e61f2021015abcbb0bd1240 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Jul 2021 12:40:03 +0200 Subject: nixpkgs: 71326cd -> c06613c --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index a8e071ff..082d9dd7 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "71326cd12ddfa0fac40fdb451fcba7dad763c56e", - "date": "2021-06-29T09:31:02+02:00", - "path": "/nix/store/110psm19cnca2l4lg966fd3vj7q57yhj-nixpkgs", - "sha256": "1939fwll9xwm7mf5crz7gfvz41c8gqd8wg7fy2v6m71viiq8lrda", + "rev": "c06613c25df3fe1dd26243847a3c105cf6770627", + "date": "2021-07-07T23:13:28+02:00", + "path": "/nix/store/jk1pr5lm5f10vvlppl6axck1bsb6mz9s-nixpkgs", + "sha256": "16si1436wf3fcx91p6cy3qxaib8kr78qivbi69lq4m63n96gglkv", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 50c25195405b7b03036af5bb9958898140d7e464 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 17 Jul 2021 08:12:35 +0200 Subject: nixpkgs: c06613c -> a165aec --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 082d9dd7..1d65fe1b 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "c06613c25df3fe1dd26243847a3c105cf6770627", - "date": "2021-07-07T23:13:28+02:00", - "path": "/nix/store/jk1pr5lm5f10vvlppl6axck1bsb6mz9s-nixpkgs", - "sha256": "16si1436wf3fcx91p6cy3qxaib8kr78qivbi69lq4m63n96gglkv", + "rev": "a165aeceda9f9741d15bc2488425daeb06c0707e", + "date": "2021-07-16T02:36:15+02:00", + "path": "/nix/store/lfcyxphw3jahipjdl2rb80yvlii3v87w-nixpkgs", + "sha256": "0bshzligqwbjlvx4jygv6k4c54mjdvj1d7xmfzgjl6hhybh3wjpd", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 49be52d39377f30cbeb4369484c648b8c7a6abb2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 17 Jul 2021 08:12:50 +0200 Subject: nixpkgs-unstable: 3a8d795 -> 53079ed --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index bd55fb50..adf59d52 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "3a8d7958a610cd3fec3a6f424480f91a1b259185", - "date": "2021-06-29T00:13:55+01:00", - "path": "/nix/store/j84n03gc032s1hf27piw86b4kskd37ch-nixpkgs", - "sha256": "0bmxrdn9sn6mxvkyyxdlxlzczfh59iy66c55ql144ilc1cjk28is", + "rev": "53079ed913181b2f945cf1580746828b57d47edb", + "date": "2021-07-16T01:55:12+02:00", + "path": "/nix/store/h8mhdm3gdc6vdjp0aca0sl4n9h4wjwdq-nixpkgs", + "sha256": "1m5y146ag2knwqni09l3cnrkfnn9mi2bmg37c2l7awxs0s9ykmpb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From dd347a19d69d4ae5aeb4db85aec5c1949944b568 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Jul 2021 12:11:56 +0200 Subject: rss-bridge: 2021-01-10 -> 2021-04-20 --- krebs/5pkgs/simple/rss-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/rss-bridge/default.nix b/krebs/5pkgs/simple/rss-bridge/default.nix index bbe5c1bd..e0a927a1 100644 --- a/krebs/5pkgs/simple/rss-bridge/default.nix +++ b/krebs/5pkgs/simple/rss-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "unstable-2021-01-10"; + version = "unstable-2021-04-20"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; - rev = "98352845a14b9f2eb8925ad7a04a5f6cc6a5af06"; - sha256 = "1nv1f6f17cn057k9mydd3a0bmj2xa5k410fdq7nhw5b7msyxy2qv"; + rev = "716f5ddc0e20c10cb77ded46380cc376913a92fd"; + sha256 = "17aqmj7rz0ysk8nj4kbjvnsjdm47d0xsypfygzzk2vagxfz5w3p8"; }; patchPhase = '' -- cgit v1.2.3 From 914b28a6b4f5401baa576db1340f09ed6d97dcb8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Jul 2021 12:24:46 +0200 Subject: nixpkgs: a165aec -> 91903ce --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 1d65fe1b..5086b8af 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "a165aeceda9f9741d15bc2488425daeb06c0707e", - "date": "2021-07-16T02:36:15+02:00", - "path": "/nix/store/lfcyxphw3jahipjdl2rb80yvlii3v87w-nixpkgs", - "sha256": "0bshzligqwbjlvx4jygv6k4c54mjdvj1d7xmfzgjl6hhybh3wjpd", + "rev": "91903ceb294dbe63a696759bfba3d23ee667f2dc", + "date": "2021-07-26T09:21:28+02:00", + "path": "/nix/store/2v649741xdh1crybi2dm879bl60zrkhf-nixpkgs", + "sha256": "1hmpwi27r4q0lnspg7ylfzxakwz2fhl3r07vjvq5yalcdqwiain3", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 3db9f05aa41b2e9e6141e2073e0838a9e69516e9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Jul 2021 12:25:08 +0200 Subject: nixpkgs-unstable: 53079ed -> dd14e5d --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index adf59d52..967f0b42 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "53079ed913181b2f945cf1580746828b57d47edb", - "date": "2021-07-16T01:55:12+02:00", - "path": "/nix/store/h8mhdm3gdc6vdjp0aca0sl4n9h4wjwdq-nixpkgs", - "sha256": "1m5y146ag2knwqni09l3cnrkfnn9mi2bmg37c2l7awxs0s9ykmpb", + "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", + "date": "2021-07-24T08:14:16-04:00", + "path": "/nix/store/0z5nrrjzmjcicjhhdrqb9vgm56zxysk3-nixpkgs", + "sha256": "1zmhwx1qqgl1wrrb9mjkck508887rldrnragvximhd7jrh1ya3fb", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From 1380200b30f2fd1dfce55a2ba28dc256fef951c6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Jul 2021 22:36:36 +0200 Subject: hotdog.r: add agenda.r alias --- krebs/3modules/krebs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'krebs') diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index 37b93935..c05409fe 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -70,6 +70,7 @@ in { ip4.addr = "10.243.77.3"; aliases = [ "hotdog.r" + "agenda.r" "build.r" "build.hotdog.r" "cgit.hotdog.r" -- cgit v1.2.3 From 34c7d727afd14a82330dd6e53dee3591f01a5462 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 27 Jul 2021 23:33:02 +0200 Subject: htgen: 1.3.0 -> 1.3.1 --- krebs/5pkgs/simple/htgen/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/htgen/default.nix b/krebs/5pkgs/simple/htgen/default.nix index 9ed97242..14b6f4c5 100644 --- a/krebs/5pkgs/simple/htgen/default.nix +++ b/krebs/5pkgs/simple/htgen/default.nix @@ -1,12 +1,13 @@ { fetchgit, lib, pkgs, stdenv }: stdenv.mkDerivation rec { pname = "htgen"; - version = "1.3.0"; + version = "1.3.1"; + #src = ; src = fetchgit { url = "http://cgit.krebsco.de/htgen"; - rev = "refs/tags/v${version}"; - sha256 = "0p3517wkfpvip4z0axh0b4v1jm1nqpppldnhq4806c0p33vrjxnf"; + rev = "refs/tags/${version}"; + sha256 = "0ml8kp89bwkrwy6iqclzyhxgv2qn9dcpwaafbmsr4mgcl70zx22r"; }; installPhase = '' -- cgit v1.2.3 From a59ca4ac80248585facd8cc43d0a8b8d43e3735d Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Jul 2021 15:37:06 +0200 Subject: reaktor2: add agenda.r webinterface --- krebs/2configs/reaktor2.nix | 141 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 132 insertions(+), 9 deletions(-) (limited to 'krebs') diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index 14e0a3d7..2fb7a54e 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -9,11 +9,11 @@ let hooks = pkgs.reaktor2-plugins.hooks; commands = pkgs.reaktor2-plugins.commands; - task = name: let - rcFile = builtins.toFile "taskrc" '' - confirmation=no - ''; - in { + taskRcFile = builtins.toFile "taskrc" '' + confirmation=no + ''; + + task = name: { pattern = "^${name}-([a-z]+)(?::?\\s*(.*))?"; activate = "match"; command = 1; @@ -21,19 +21,19 @@ let env.TASKDATA = "${stateDir}/${name}"; commands = { add.filename = pkgs.writeDash "${name}-task-add" '' - ${pkgs.taskwarrior}/bin/task rc:${rcFile} add "$1" + ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} add "$1" ''; list.filename = pkgs.writeDash "${name}-task-list" '' - ${pkgs.taskwarrior}/bin/task rc:${rcFile} export \ + ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} export \ | ${pkgs.jq}/bin/jq -r ' .[] | select(.id != 0) | "\(.id) \(.description)" ' ''; delete.filename = pkgs.writeDash "${name}-task-delete" '' - ${pkgs.taskwarrior}/bin/task rc:${rcFile} delete "$1" + ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} delete "$1" ''; done.filename = pkgs.writeDash "${name}-task-done" '' - ${pkgs.taskwarrior}/bin/task rc:${rcFile} done "$1" + ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} done "$1" ''; }; }; @@ -122,6 +122,129 @@ in { isSystemUser = true; }; + systemd.services.htgen-agenda.serviceConfig.StateDirectory = "reaktor2"; + krebs.htgen.agenda = { + port = 8009; + user = { + name = "reaktor2"; + home = stateDir; + }; + script = ''. ${pkgs.writeDash "agenda" '' + echo "$Method $Request_URI" >&2 + case "$Method" in + "GET") + printf 'HTTP/1.1 200 OK\r\n' + printf 'Connection: close\r\n' + printf '\r\n' + TASKDATA=/var/lib/reaktor2/agenda ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} export + exit + ;; + esac + ''}''; + }; + + services.nginx = { + virtualHosts."agenda.r" = { + locations."= /index.html".extraConfig = '' + alias ${pkgs.writeText "agenda.html" '' + + + + Agenda + + + + + +
+ + + + ''}; + ''; + locations."/agenda.json".extraConfig = '' + proxy_set_header Host $host; + proxy_pass http://localhost:8009; + ''; + extraConfig = '' + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + ''; + }; + }; + krebs.reaktor2 = { hackint = { hostname = "irc.hackint.org"; -- cgit v1.2.3 From d6febec1442b48d75771cba09bc54a96b5d8cd5f Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Jul 2021 15:37:39 +0200 Subject: reaktor2: disable freenode reaktor --- krebs/2configs/reaktor2.nix | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'krebs') diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index 2fb7a54e..15be3eec 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -263,23 +263,6 @@ in { username = "reaktor2"; port = "6697"; }; - freenode = { - hostname = "irc.freenode.org"; - nick = "reaktor2|krebs"; - plugins = [ - { - plugin = "register"; - config = { - channels = [ - "#krebs" - ]; - }; - } - systemPlugin - ]; - username = "reaktor2"; - port = "6697"; - }; r = { nick = "reaktor2|krebs"; sendDelaySec = null; -- cgit v1.2.3 From 36db8bee2faae73baf60dc229894e259edbaa639 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 29 Jul 2021 15:46:34 +0200 Subject: reaktor2: fix dynamicUser not being able to write agenda --- krebs/2configs/reaktor2.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'krebs') diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index 15be3eec..e9837ff7 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -120,8 +120,11 @@ in { uid = genid_uint31 "reaktor2"; home = stateDir; isSystemUser = true; + extraGroups = [ "reaktor2" ]; }; + users.groups.reaktor2 = {}; + systemd.services.htgen-agenda.serviceConfig.StateDirectory = "reaktor2"; krebs.htgen.agenda = { port = 8009; @@ -245,6 +248,8 @@ in { }; }; + systemd.services.reaktor2-r.serviceConfig.DynamicUser = mkForce false; + systemd.services.reaktor2-hackint.serviceConfig.DynamicUser = mkForce false; krebs.reaktor2 = { hackint = { hostname = "irc.hackint.org"; -- cgit v1.2.3 From ba6a5456e8d76b9c1eae7cd81dca3f2b16359ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 29 Jul 2021 17:05:39 +0200 Subject: reaktor2: fix agenda.r webinterface custom styling --- krebs/2configs/reaktor2.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'krebs') diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index e9837ff7..4a33c33e 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -187,16 +187,18 @@ in { const params = Object.fromEntries(urlSearchParams.entries()); if (params.hasOwnProperty("style")) { - fetch(params["style"]) - .then((response) => - response.text().then((css) => { - const title = document.getElementsByTagName("title")[0]; - const style = document.createElement("style"); - style.appendChild(document.createTextNode(css)); - title.appendChild(style); - }) - ) - .catch(console.log); + const cssUrls = params["style"].split(" ").filter((x) => x.length > 0); + for (const cssUrl of cssUrls) + fetch(cssUrl) + .then((response) => + response.text().then((css) => { + const title = document.getElementsByTagName("head")[0]; + const style = document.createElement("style"); + style.appendChild(document.createTextNode(css)); + title.appendChild(style); + }) + ) + .catch(console.log); } fetch("/agenda.json") -- cgit v1.2.3