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 = { 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 { 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"; 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 ''; 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