From dc1f81ad51c14f1f08a9e20b17c9debdad76d358 Mon Sep 17 00:00:00 2001 From: Leander Scherer Date: Thu, 2 Jul 2026 14:54:54 +0200 Subject: chore: formatting --- modules/services/git.nix | 5 ++- modules/services/nextcloud.nix | 11 +++-- modules/services/openssh.nix | 96 +++++++++++++++++++++--------------------- 3 files changed, 60 insertions(+), 52 deletions(-) (limited to 'modules/services') diff --git a/modules/services/git.nix b/modules/services/git.nix index 12ef804..a9f8213 100644 --- a/modules/services/git.nix +++ b/modules/services/git.nix @@ -82,7 +82,10 @@ config.sops.secrets."borgbase_ssh_key".path } -o StrictHostKeyChecking=accept-new"; }; - extraCreateArgs = [ "--info" "--stats" ]; + extraCreateArgs = [ + "--info" + "--stats" + ]; compression = "auto,lzma"; startAt = "daily"; preHook = '' diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 38b6145..43f801a 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -85,7 +85,10 @@ } -o StrictHostKeyChecking=accept-new"; TMPDIR = "/var/tmp"; }; - extraCreateArgs = [ "--info" "--stats" ]; + extraCreateArgs = [ + "--info" + "--stats" + ]; compression = "auto,lzma"; startAt = "daily"; readWritePaths = [ @@ -95,7 +98,7 @@ preHook = '' set -euo pipefail export BORG_REPO="$(cat ${config.sops.secrets."borg_nextcloud_repo".path})" - + INSTALL="${pkgs.coreutils}/bin/install" FIND="${pkgs.findutils}/bin/find" MYSQLDUMP="${pkgs.mariadb.client}/bin/mariadb-dump" @@ -122,7 +125,9 @@ ''; }; - systemd.services."borgbackup-job-nextcloud".unitConfig.OnFailure = [ "notify-backup-failure@%n.service" ]; + systemd.services."borgbackup-job-nextcloud".unitConfig.OnFailure = [ + "notify-backup-failure@%n.service" + ]; services.fail2ban = { enable = true; diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index 98241df..5775ca8 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -38,55 +38,55 @@ security.pam.services.sshd.text = lib.mkDefault ( lib.mkAfter '' session optional pam_exec.so ${pkgs.writeShellScript "ssh-login-notify" '' - if [ "$PAM_TYPE" = "open_session" ]; then - TIMESTAMP=$(${pkgs.coreutils}/bin/date "+%Y-%m-%d %H:%M:%S %Z") - HOSTNAME=$(${pkgs.coreutils}/bin/cat /etc/hostname) - - ( - ${pkgs.coreutils}/bin/echo "To: leander@schererleander.de" - ${pkgs.coreutils}/bin/echo "From: root@sachiel.schererleander.de" - ${pkgs.coreutils}/bin/echo "Subject: SSH Login Alert: $PAM_USER" - ${pkgs.coreutils}/bin/echo "Content-Type: text/html; charset=UTF-8" - ${pkgs.coreutils}/bin/echo "" - ${pkgs.coreutils}/bin/cat < - - - - - - -

SSH Login Alert

- -

A successful SSH login was just detected.

+ if [ "$PAM_TYPE" = "open_session" ]; then + TIMESTAMP=$(${pkgs.coreutils}/bin/date "+%Y-%m-%d %H:%M:%S %Z") + HOSTNAME=$(${pkgs.coreutils}/bin/cat /etc/hostname) + + ( + ${pkgs.coreutils}/bin/echo "To: leander@schererleander.de" + ${pkgs.coreutils}/bin/echo "From: root@sachiel.schererleander.de" + ${pkgs.coreutils}/bin/echo "Subject: SSH Login Alert: $PAM_USER" + ${pkgs.coreutils}/bin/echo "Content-Type: text/html; charset=UTF-8" + ${pkgs.coreutils}/bin/echo "" + ${pkgs.coreutils}/bin/cat < + + + + + + +

SSH Login Alert

+ +

A successful SSH login was just detected.

- - - - - - - -
User$PAM_USER
Host$HOSTNAME
Time$TIMESTAMP
IP Address$PAM_RHOST
Service$PAM_SERVICE
TTY$PAM_TTY
- - -EOF - ) | /run/wrappers/bin/sendmail -f root@sachiel.schererleander.de leander@schererleander.de - fi + + + + + + + +
User$PAM_USER
Host$HOSTNAME
Time$TIMESTAMP
IP Address$PAM_RHOST
Service$PAM_SERVICE
TTY$PAM_TTY
+ + + EOF + ) | /run/wrappers/bin/sendmail -f root@sachiel.schererleander.de leander@schererleander.de + fi ''} '' ); -- cgit v1.3.1