Compare commits

..

No commits in common. "a189abf9120b3edda89755c7bc9bcd800887db8f" and "25c24a6c3eca679dcb3e1a0946e67496f19eb723" have entirely different histories.

5 changed files with 11 additions and 21 deletions

View File

@ -11,7 +11,7 @@
forceLocalDataSSL = true; forceLocalDataSSL = true;
userlistDeny = false; userlistDeny = false;
localUsers = true; localUsers = true;
userlist = ["claire" "manu" "lakeu" "fusil" "stryxion"]; userlist = ["claire" "manu"];
rsaCertFile = "/var/vsftpd/vsftpd.pem"; rsaCertFile = "/var/vsftpd/vsftpd.pem";
extraConfig = '' extraConfig = ''
pasv_min_port=64000 pasv_min_port=64000
@ -32,24 +32,6 @@
hashedPassword = "$6$YGNIdGEclo$JcUotBS6hqlpENjjUeYhDjtrwxu10oARF4Nq4tEo072Sumr3Rl/w3ZXSHI5/3RxfvUMmJ4ulUVctBLhwrqP.g0"; hashedPassword = "$6$YGNIdGEclo$JcUotBS6hqlpENjjUeYhDjtrwxu10oARF4Nq4tEo072Sumr3Rl/w3ZXSHI5/3RxfvUMmJ4ulUVctBLhwrqP.g0";
description = "Emmanuel ZENNER"; 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 = { bindMounts = {

View File

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

View File

@ -72,6 +72,11 @@
fsType = "zfs"; fsType = "zfs";
}; };
fileSystems."/var/lib/emby/ProgramData-Server" =
{ device = "loutrepool/var/emby";
fsType = "zfs";
};
fileSystems."/var/lib/syncthing" = fileSystems."/var/lib/syncthing" =
{ device = "loutrepool/var/syncthing"; { device = "loutrepool/var/syncthing";
fsType = "zfs"; fsType = "zfs";

View File

@ -33,7 +33,7 @@ let
login_mail_alert = pkgs.writeShellScriptBin "mail_alert.sh" '' login_mail_alert = pkgs.writeShellScriptBin "mail_alert.sh" ''
if [ "$PAM_TYPE" != "close_session" ]; then if [ "$PAM_TYPE" != "close_session" ]; then
${sendMail "paul@nyanlout.re" "SSH Login: $PAM_USER from $PAM_RHOST" "`env`"}/bin/mail.sh ${sendMail "paul@nyanlout.re" "SSH Login: $PAM_USER from $PAM_RHOST" "`env`"}
fi fi
''; '';

View File

@ -16,7 +16,6 @@
# Gestionnaires de version # Gestionnaires de version
gitFull gitFull
tig tig
gitAndTools.hub
# Gestion de paquets # Gestion de paquets
nix-prefetch-scripts nix-prefetch-scripts