diff options
| author | lassulus <lassulus@lassul.us> | 2022-12-13 14:51:58 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2022-12-13 14:51:58 +0100 |
| commit | 248d3f592adbe3f7567c25f8f7efc1045b25e216 (patch) | |
| tree | 3f104763aa31b18fdbfc42d37cede13600e5ef94 /makefu/2configs | |
| parent | 2ab781fca929451d1c8bc6da1b6caa6c89b7786a (diff) | |
| parent | d4281b3dbeb8452844ccb679839ad601b20fe64a (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/bgt/download.binaergewitter.de.nix | 17 | ||||
| -rw-r--r-- | makefu/2configs/default.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/gui/look-up.nix | 7 | ||||
| -rw-r--r-- | makefu/2configs/security/hotfix.nix | 4 |
4 files changed, 14 insertions, 16 deletions
diff --git a/makefu/2configs/bgt/download.binaergewitter.de.nix b/makefu/2configs/bgt/download.binaergewitter.de.nix index d49ad158b..31da31a71 100644 --- a/makefu/2configs/bgt/download.binaergewitter.de.nix +++ b/makefu/2configs/bgt/download.binaergewitter.de.nix @@ -43,16 +43,13 @@ in { services.logrotate = { enable = true; - config = '' - ${bgtaccess} ${bgterror} { - rotate 5 - weekly - create 600 nginx nginx - postrotate - ${pkgs.systemd}/bin/systemctl reload nginx - endscript - } - ''; + settings.bgt = { + files = [ bgtaccess bgterror ]; + rotate = 5; + frequency = "weekly"; + create = "600 nginx nginx"; + postrotate = "${pkgs.systemd}/bin/systemctl reload nginx"; + }; }; # 20.09 unharden nginx to write logs 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..e04098cc2 100644 --- a/makefu/2configs/gui/look-up.nix +++ b/makefu/2configs/gui/look-up.nix @@ -1,4 +1,9 @@ -{ +{pkgs, config, ... }: +let + user = config.krebs.build.user.name; + window-manager = "awesome"; +in + { systemd.services.look-up = { startAt = "*:30"; serviceConfig = { 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" ""); -} |