From 612a41ca9b4f3a537e152f342b7cabcc8e3996ac Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 31 Jul 2019 13:51:51 +0200
Subject: [PATCH 1/5] Ajout Wololoc au FTP

---
 containers/vsftpd.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/containers/vsftpd.nix b/containers/vsftpd.nix
index 77fceae..a21d8ee 100644
--- a/containers/vsftpd.nix
+++ b/containers/vsftpd.nix
@@ -11,7 +11,7 @@
           forceLocalDataSSL = true;
           userlistDeny = false;
           localUsers = true;
-          userlist = ["claire" "manu"];
+          userlist = ["claire" "manu" "lakeu" "fusil" "stryxion"];
           rsaCertFile = "/var/vsftpd/vsftpd.pem";
           extraConfig = ''
             pasv_min_port=64000
@@ -32,6 +32,24 @@
             hashedPassword = "$6$YGNIdGEclo$JcUotBS6hqlpENjjUeYhDjtrwxu10oARF4Nq4tEo072Sumr3Rl/w3ZXSHI5/3RxfvUMmJ4ulUVctBLhwrqP.g0";
             description = "Emmanuel ZENNER";
           };
+
+          lakeu = {
+            isNormalUser = true;
+            hashedPassword = "$6$Y7Rohw3xMzCGp$DVTZVAQccBeM/iVUH1IOgkXUohWjTvujNuvekezWS3vdEm1BUxkYZqH2ECHj5DN.ZiGFjJHhBh7PpbE8GDxSz.";
+            description = "Lakeu";
+          };
+
+          fusil = {
+            isNormalUser = true;
+            hashedPassword = "$6$HndxtEEO1w4$FC6rXf1h98tyt0Ay670iz1jbaNj8vKwH8BHYf3vsbSennA63r94x67I5KxmVOxOIEbIf55zIWFsM8GpyJ9K6Y/";
+            description = "Fusil";
+          };
+
+          stryxion = {
+            isNormalUser = true;
+            hashedPassword = "$6$KZKwBLI6yGuvFg2Q$VCfSnhAacgxlxybTyuCDyNQ2InM8ppG3aa3Bw176TiNAX8tHWUpKesfI9YfcCoGAi1zSzA7b6uC8BmmfrQwg1.";
+            description = "Stryxion";
+          };
         };
       };
     bindMounts = {

From 78284f5e60c6176f289eb59f582671274e5ce240 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 31 Jul 2019 13:52:19 +0200
Subject: [PATCH 2/5] haproxy: supression espaces inutiles

---
 services/haproxy-acme.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/services/haproxy-acme.nix b/services/haproxy-acme.nix
index 312ad43..48df698 100644
--- a/services/haproxy-acme.nix
+++ b/services/haproxy-acme.nix
@@ -36,13 +36,11 @@ let
       http-response set-header Strict-Transport-Security max-age=15768000
       use_backend letsencrypt-backend if letsencrypt-acl
       use_backend haproxy_stats if haproxy-acl
-
     ${concatStrings (
       mapAttrsToList (name: value:
         "  acl ${name}-acl hdr(host) -i ${name}\n"
       + "  use_backend ${name}-backend if ${name}-acl\n"
       ) cfg.services)}
-
     backend letsencrypt-backend
       mode http
       server letsencrypt 127.0.0.1:${toString nginx_port}
@@ -52,7 +50,6 @@ let
       stats hide-version
       acl AuthOK_LOUTRE http_auth(LOUTRE)
       http-request auth realm LOUTRE if !AuthOK_LOUTRE
-
     ${concatStrings (
       mapAttrsToList (name: value:
         ''
@@ -78,7 +75,6 @@ let
           ) else "")}
         ''
       ) cfg.services)}
-
   '';
 in
 {

From 5aff716570217d16de7da754d9158d5ba6484f13 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 31 Jul 2019 13:52:47 +0200
Subject: [PATCH 3/5] =?UTF-8?q?mount:=20supression=20montage=20Emby=20inut?=
 =?UTF-8?q?ilis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 systems/LoutreOS/hardware-configuration.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/systems/LoutreOS/hardware-configuration.nix b/systems/LoutreOS/hardware-configuration.nix
index a3834d9..436363e 100644
--- a/systems/LoutreOS/hardware-configuration.nix
+++ b/systems/LoutreOS/hardware-configuration.nix
@@ -72,11 +72,6 @@
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/emby/ProgramData-Server" =
-    { device = "loutrepool/var/emby";
-      fsType = "zfs";
-    };
-
   fileSystems."/var/lib/syncthing" =
     { device = "loutrepool/var/syncthing";
       fsType = "zfs";

From e2cf877e6af8c12b3409aea2c6259e8b67fcc62c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 31 Jul 2019 13:53:17 +0200
Subject: [PATCH 4/5] fix: mauvais appel alerte login mail

---
 systems/LoutreOS/services.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix
index 914b5bc..6d5ae8d 100644
--- a/systems/LoutreOS/services.nix
+++ b/systems/LoutreOS/services.nix
@@ -33,7 +33,7 @@ let
 
   login_mail_alert = pkgs.writeShellScriptBin "mail_alert.sh" ''
     if [ "$PAM_TYPE" != "close_session" ]; then
-      ${sendMail "paul@nyanlout.re" "SSH Login: $PAM_USER from $PAM_RHOST" "`env`"}
+      ${sendMail "paul@nyanlout.re" "SSH Login: $PAM_USER from $PAM_RHOST" "`env`"}/bin/mail.sh
     fi
   '';
 

From a189abf9120b3edda89755c7bc9bcd800887db8f Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Wed, 31 Jul 2019 13:53:35 +0200
Subject: [PATCH 5/5] installation gitAndTools.hub

---
 systems/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/systems/common.nix b/systems/common.nix
index 6fbe1b1..b3e181b 100644
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -16,6 +16,7 @@
     # Gestionnaires de version
     gitFull
     tig
+    gitAndTools.hub
 
     # Gestion de paquets
     nix-prefetch-scripts