summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ymir.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/ymir.nix b/ymir.nix
index 0bb08c7a..9b54d440 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -845,8 +845,7 @@ in rec {
845 extraDomains = builtins.listToAttrs (builtins.map (name: { inherit name; value = "/srv/www/acme/${name}"; }) myDomains); 845 extraDomains = builtins.listToAttrs (builtins.map (name: { inherit name; value = "/srv/www/acme/${name}"; }) myDomains);
846 activationDelay = "6h"; 846 activationDelay = "6h";
847 postRun = '' 847 postRun = ''
848 systemctl reload nginx.service dovecot2.service postfix.service prosody.service 848 systemctl reload nginx.service dovecot2.service postfix.service prosody.service vsftpd.service infinoted.service
849 systemctl restart vsftpd.service
850 ''; 849 '';
851 }; 850 };
852 }; 851 };
@@ -995,6 +994,11 @@ in rec {
995 ''; 994 '';
996 }; 995 };
997 996
997 systemd.services."infinoted".serviceConfig = {
998 Type = "notify";
999 ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
1000 };
1001
998 users.extraUsers."infinoted" = { 1002 users.extraUsers."infinoted" = {
999 isSystemUser = true; 1003 isSystemUser = true;
1000 }; 1004 };
@@ -1050,6 +1054,8 @@ in rec {
1050 ''; 1054 '';
1051 }; 1055 };
1052 1056
1057 systemd.services."vsftpd".serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
1058
1053 security.pam.services."vsftpd".text = '' 1059 security.pam.services."vsftpd".text = ''
1054 auth required ${pkgs.pam_pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd 1060 auth required ${pkgs.pam_pwdfile}/lib/security/pam_pwdfile.so pwdfile=/srv/ftp.htpasswd
1055 account required pam_permit.so 1061 account required pam_permit.so