summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kartei/makefu/default.nix6
-rw-r--r--kartei/makefu/wiregrill/telex.pub1
-rw-r--r--makefu/2configs/bgt/download.binaergewitter.de.nix2
-rw-r--r--makefu/2configs/default.nix2
-rw-r--r--makefu/2configs/gui/look-up.nix1
-rw-r--r--makefu/2configs/security/hotfix.nix4
6 files changed, 10 insertions, 6 deletions
diff --git a/kartei/makefu/default.nix b/kartei/makefu/default.nix
index f9997b2d2..ecb834bbf 100644
--- a/kartei/makefu/default.nix
+++ b/kartei/makefu/default.nix
@@ -151,6 +151,12 @@ in {
};
};
};
+ # pixel3a
+ telex.nets.wiregrill = {
+ aliases = ["telex.w"];
+ ip6.addr = (krebs.genipv6 "wiregrill" "makefu" { hostName = "telex"; }).address;
+ };
+
latte = rec {
ci = true;
extraZones = {
diff --git a/kartei/makefu/wiregrill/telex.pub b/kartei/makefu/wiregrill/telex.pub
new file mode 100644
index 000000000..12a42177e
--- /dev/null
+++ b/kartei/makefu/wiregrill/telex.pub
@@ -0,0 +1 @@
+T7Cr80dBbtPFCPdz4OS7whDlQJzn2Orclq5rLVtD+Ds=
diff --git a/makefu/2configs/bgt/download.binaergewitter.de.nix b/makefu/2configs/bgt/download.binaergewitter.de.nix
index d49ad158b..bd5dc5bf7 100644
--- a/makefu/2configs/bgt/download.binaergewitter.de.nix
+++ b/makefu/2configs/bgt/download.binaergewitter.de.nix
@@ -43,7 +43,7 @@ in {
services.logrotate = {
enable = true;
- config = ''
+ settings.header = ''
${bgtaccess} ${bgterror} {
rotate 5
weekly
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 66c77e1eb..9a08a4497 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -11,7 +11,7 @@ with import <stockholm/lib>;
./editor/vim.nix
./binary-cache/nixos.nix
./minimal.nix
- ./security/hotfix.nix
+ # ./security/hotfix.nix
];
# users are super important
diff --git a/makefu/2configs/gui/look-up.nix b/makefu/2configs/gui/look-up.nix
index d27f5cff7..244cf21b5 100644
--- a/makefu/2configs/gui/look-up.nix
+++ b/makefu/2configs/gui/look-up.nix
@@ -1,3 +1,4 @@
+{pkgs, ... }:
{
systemd.services.look-up = {
startAt = "*:30";
diff --git a/makefu/2configs/security/hotfix.nix b/makefu/2configs/security/hotfix.nix
deleted file mode 100644
index fc52f21e6..000000000
--- a/makefu/2configs/security/hotfix.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, lib,... }: {
- # https://github.com/berdav/CVE-2021-4034
- security.wrappers.pkexec.source = lib.mkForce (pkgs.writeText "pkexec" "");
-}