From 7b1a962d8ca2f7e1b672672a3f9cdedf1353599b Mon Sep 17 00:00:00 2001 From: Andreas Zweili Date: Wed, 31 May 2023 22:29:27 +0200 Subject: [PATCH] Move syslog into options --- modules/default.nix | 1 + modules/syslog/default.nix | 28 ++++++++++++++++++---------- systems/raspi4/default.nix | 6 ++++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/modules/default.nix b/modules/default.nix index 1c9d5f4..d64d1a8 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -18,6 +18,7 @@ ./rdp ./restic-client-desktop ./scripts + ./syslog ./telegram-notifications ./tlp ./tmux diff --git a/modules/syslog/default.nix b/modules/syslog/default.nix index 1177905..81d3012 100644 --- a/modules/syslog/default.nix +++ b/modules/syslog/default.nix @@ -1,14 +1,22 @@ -{ ... }: +{ config, lib, ... }: +let + cfg = config.serivces.az-syslog; +in { - services.rsyslogd = { - enable = true; - defaultConfig = '' - *.* action(type="omfwd" target="10.7.89.108" port="514" protocol="udp" - action.resumeRetryCount="100" - queue.type="linkedList" queue.size="10000") - ''; + options = { + services.az-syslog.enable = lib.mkEnableOption "Enable syslog"; + }; + + config = lib.mkIf cfg.enable { + services.rsyslogd = { + enable = true; + defaultConfig = '' + *.* action(type="omfwd" target="10.7.89.108" port="514" protocol="udp" + action.resumeRetryCount="100" + queue.type="linkedList" queue.size="10000") + ''; + }; + systemd.services.syslog.after = [ "network-online.target" ]; }; - systemd.services.syslog.after = [ "network-online.target" ]; } - diff --git a/systems/raspi4/default.nix b/systems/raspi4/default.nix index 3097ddd..9b73b54 100644 --- a/systems/raspi4/default.nix +++ b/systems/raspi4/default.nix @@ -2,7 +2,6 @@ { imports = [ inputs.nixos-hardware.nixosModules.raspberry-pi-4 - "${inputs.self}/modules/syslog" ]; boot = { @@ -53,5 +52,8 @@ sudo umount /mnt ''; }; - services.az-log2ram.enable = true; + services = { + az-log2ram.enable = true; + az-syslog.enable = true; + }; }