From 08887763dcf8a3e4d2a8152f051d4fa00d5b216e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 27 May 2022 19:59:06 +0200
Subject: l security-workarounds: remove pkexec fix

---
 krebs/2configs/security-workarounds.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/security-workarounds.nix b/krebs/2configs/security-workarounds.nix
index 0743f2b4..b1a492f5 100644
--- a/krebs/2configs/security-workarounds.nix
+++ b/krebs/2configs/security-workarounds.nix
@@ -1,6 +1,4 @@
 { config, lib, pkgs, ... }:
 with import <stockholm/lib>;
 {
-  # https://github.com/Lassulus/CVE-2021-4034
-  security.wrappers.pkexec.source = lib.mkForce (pkgs.writeText "pkexec" "");
 }
-- 
cgit v1.2.3


From a6c74f87d1075d06bc9215db128479b74297ac7e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 27 May 2022 20:13:03 +0200
Subject: news: youtube-dl -> yt-dlp

---
 krebs/2configs/news.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/news.nix b/krebs/2configs/news.nix
index 1f966bf2..9e2cec10 100644
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@@ -164,7 +164,7 @@
                   if [ ''${#youtube_url} -eq 24 ]; then
                     youtube_id=$youtube_url
                   else
-                    youtube_id=$(${pkgs.youtube-dl}/bin/youtube-dl --max-downloads 1 -j "$youtube_url" | ${pkgs.jq}/bin/jq -r '.channel_id')
+                    youtube_id=$(${pkgs.yt-dlp}/bin/yt-dlp --max-downloads 1 -j "$youtube_url" | ${pkgs.jq}/bin/jq -r '.channel_id')
                   fi
                   echo "brockman: add yt_$youtube_nick http://rss.r/?action=display&bridge=Youtube&context=By+channel+id&c=$youtube_id&duration_min=&duration_max=&format=Mrss"
                 '';
-- 
cgit v1.2.3


From 9e36a59fb16d7c4eb5dacae77069403790302aa1 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 28 May 2022 12:11:37 +0200
Subject: container-networking: NAT to con*

---
 krebs/2configs/container-networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/container-networking.nix b/krebs/2configs/container-networking.nix
index fa448880..bf3fe711 100644
--- a/krebs/2configs/container-networking.nix
+++ b/krebs/2configs/container-networking.nix
@@ -1,7 +1,7 @@
 { lib, ... }:
 {
   networking.nat.enable = true;
-  networking.nat.internalInterfaces = ["ve-+"];
+  networking.nat.internalInterfaces = ["ve-+" "ctr+" ];
   networking.nat.externalInterface = lib.mkDefault "et0";
   networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
 }
-- 
cgit v1.2.3


From d9fe5d46299206730e88ba61a32f4a34c6eea44c Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 28 May 2022 12:13:38 +0200
Subject: matterbridge: remove mumble bridge

---
 krebs/2configs/matterbridge.nix | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/matterbridge.nix b/krebs/2configs/matterbridge.nix
index 9c0908de..a68aa292 100644
--- a/krebs/2configs/matterbridge.nix
+++ b/krebs/2configs/matterbridge.nix
@@ -19,11 +19,6 @@
             inherit Nick;
           };
         };
-        mumble.lassulus = {
-          Server = "lassul.us:64738";
-          Nick = "krebs_bridge";
-          SkipTLSVerify = true;
-        };
         gateway = [
           {
             name = "krebs-bridge";
@@ -37,10 +32,6 @@
                 account = "telegram.krebs";
                 channel = "-330372458";
               }
-              {
-                account = "mumble.lassulus";
-                channel = 6; # "nixos"
-              }
             ];
           }
         ];
-- 
cgit v1.2.3


From ea3c3d52f7ddd7d770f28315b444efb0fc931ec5 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 28 May 2022 16:20:56 +0200
Subject: agenda.r: add kri.r alias

---
 krebs/2configs/reaktor2.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 305d3140..205cc96f 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -148,6 +148,7 @@ in {
 
   services.nginx = {
     virtualHosts."agenda.r" = {
+      serverAliases = [ "kri.r" ];
       locations."= /index.html".extraConfig = ''
         alias ${pkgs.writeText "agenda.html" ''
 <!DOCTYPE html>
-- 
cgit v1.2.3