Move secrets module outside of nixops

[perso/Immae/Config/Nix.git] / nixops / modules / databases / postgresql.nix

diff --git a/nixops/modules/databases/postgresql.nix b/nixops/modules/databases/postgresql.nix
index 62e9e34889eddcec1b62150262a80a32f49a154b..3a58c48c2716f9514a1fe1977f8fab06fecf46db 100644 (file)
--- a/nixops/modules/databases/postgresql.nix
+++ b/nixops/modules/databases/postgresql.nix
@@ -15,15 +15,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [ (self: super: rec {
-      postgresql = postgresql_11;
-      postgresql_11 = super.postgresql_11.overrideAttrs(old: rec {
-        passthru = old.passthru // { psqlSchema = "11.0"; };
-        configureFlags = old.configureFlags ++ [ "--with-pam" ];
-        buildInputs = (old.buildInputs or []) ++ [ self.pam ];
-        patches = old.patches ++ [
-          ./postgresql_run_socket_path.patch
-        ];
-      });
+      postgresql = self.postgresql_11_custom;
     }) ];
 
     networking.firewall.allowedTCPPorts = [ 5432 ];
@@ -77,7 +69,7 @@ in {
       '';
     };
 
-    mySecrets.keys = [
+    secrets.keys = [
       {
         dest = "postgresql/pam";
         permissions = "0400";