From b90a2c79b29d43d83b6f3c4f6e23dfb41725e12c Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 7 Jun 2019 10:26:33 +0200 Subject: [PATCH 1/4] nixos-mailserver: update 2.2.1 --- services/mail-server.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/mail-server.nix b/services/mail-server.nix index bcfa591..b104820 100644 --- a/services/mail-server.nix +++ b/services/mail-server.nix @@ -17,8 +17,8 @@ in imports = [ (builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/8b7dde4b54da821ca3dc2058178d6ffbd2e25bc5/nixos-mailserver-8b7dde4b54da821ca3dc2058178d6ffbd2e25bc5.tar.gz"; - sha256 = "0pf25ns3yq9vdbpb30cplx4zkj7srrklamd6kw7ifaf7gyc7fy65"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz"; + sha256 = "03d49v8qnid9g9rha0wg2z6vic06mhp0b049s3whccn1axvs2zzx"; }) ]; From de25eb9a3607210e11c8c924837e2e0670cfa4d9 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 7 Jun 2019 10:27:23 +0200 Subject: [PATCH 2/4] ajout utilisateur jellyfin dans groupe media --- systems/LoutreOS/users.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/LoutreOS/users.nix b/systems/LoutreOS/users.nix index 0698d64..3fd89ab 100644 --- a/systems/LoutreOS/users.nix +++ b/systems/LoutreOS/users.nix @@ -33,6 +33,6 @@ users.extraGroups.medias = { gid = 498; - members = [ "slimserver" "radarr" "sonarr" "emby" "transmission" ]; + members = [ "slimserver" "radarr" "sonarr" "jellyfin" "transmission" ]; }; } From 651a0d3c647ae4633e36623360aa76e5828a51dc Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 7 Jun 2019 10:28:24 +0200 Subject: [PATCH 3/4] port SSH alternatif --- systems/LoutreOS/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index fec57f5..2aeb375 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -81,6 +81,9 @@ in # externalIP = "0.0.0.0"; internalIPs = [ "10.30.0.0/16" ]; internalInterfaces = [ "eno2" ]; + forwardPorts = [ + { destination = "10.30.0.1:22"; proto = "tcp"; sourcePort = 8443;} + ]; }; firewall = { From a93d836d36b123f104e70348d61536b2932a66d6 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 7 Jun 2019 11:57:12 +0200 Subject: [PATCH 4/4] =?UTF-8?q?envoi=20mail=20apr=C3=A8s=20login?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- systems/LoutreOS/services.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index fa29bc8..36493fe 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -11,6 +11,16 @@ let musique_port = 52349; factorio_port = 52351; airsonic_port = 4040; + + login_mail_alert = pkgs.writeShellScriptBin "mail_alert.sh" '' + if [ "$PAM_TYPE" != "close_session" ]; then + ${pkgs.system-sendmail}/bin/sendmail paul@nyanlout.re <