Unverified Commit e59f7ab9 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #278152 from ckiee/roundcube-fix-postgresql-package-ref 

nixos/roundcube: eliminate extra postgres package for local databases
parents bbe1fb61 bdde2598

nixos/modules/services/mail/roundcube.nix

+3 −2
Original line number Diff line number Diff line
@@ -247,14 +247,15 @@ in 
      (mkIf (cfg.database.host == "localhost") {

        requires = [ "postgresql.service" ];

        after = [ "postgresql.service" ];

        path = [ config.services.postgresql.package ];

      })

      {

        wants = [ "network-online.target" ];

        after = [ "network-online.target" ];

        wantedBy = [ "multi-user.target" ];



        path = [ config.services.postgresql.package ];

        script = let

          psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} ${pkgs.postgresql}/bin/psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}";

          psql = "${lib.optionalString (!localDB) "PGPASSFILE=${cfg.database.passwordFile}"} psql ${lib.optionalString (!localDB) "-h ${cfg.database.host} -U ${cfg.database.username} "} ${cfg.database.dbname}";

        in

        ''

          version="$(${psql} -t <<< "select value from system where name = 'roundcube-version';" || true)"