X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fftp%2Fdefault.nix;h=541e1197ab6c54b167366617a56396db218502f2;hb=6e2dc958bc8c5aac4871d2a618741fa4628ed126;hp=0409f23e5ed72ab6e3468c7a7bc697ef854935f6;hpb=926a4007ae464c08363c75aa177d978d803366a6;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/ftp/default.nix b/nixops/modules/ftp/default.nix
index 0409f23..541e119 100644
--- a/nixops/modules/ftp/default.nix
+++ b/nixops/modules/ftp/default.nix
@@ -19,10 +19,6 @@
       extraDomains = { "ftp.immae.eu" = null; };
     };
 
-    nixpkgs.overlays = [ (self: super: {
-      pure-ftpd = self.callPackage ./pure-ftpd.nix {};
-    }) ];
-
     networking = {
       firewall = {
         allowedTCPPorts = [ 21 ];
@@ -47,7 +43,8 @@
       install -m 0755 -o ftp -g ftp -d /var/lib/ftp
       '';
 
-    deployment.keys.pure-ftpd-ldap = {
+    mySecrets.keys = [{
+      dest = "pure-ftpd-ldap";
       permissions = "0400";
       user = "ftp";
       group = "ftp";
@@ -70,7 +67,7 @@
         # Compile dans pure-ftpd directement avec immaeFtpUid / immaeFtpGid
         LDAPHomeDir         immaeFtpDirectory
         '';
-    };
+    }];
 
     systemd.services.pure-ftpd = let
       configFile = pkgs.writeText "pure-ftpd.conf" ''
@@ -88,7 +85,7 @@
         SyslogFacility               ftp
         DontResolve                  yes
         MaxIdleTime                  15
-        LDAPConfigFile               /run/keys/pure-ftpd-ldap
+        LDAPConfigFile               /var/secrets/pure-ftpd-ldap
         LimitRecursion               10000 8
         AnonymousCanCreateDirs       no
         MaxLoad                      4