Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 58fb23f72ad9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f7bcffe219e
Choose a head ref
  • 5 commits
  • 2 files changed
  • 4 contributors

Commits on Oct 19, 2019

  1. Copy the full SHA
    6a600b1 View commit details

Commits on Nov 4, 2019

  1. Copy the full SHA
    ddc35b1 View commit details

Commits on Nov 19, 2019

  1. Merge pull request #1 from DinCahill/fix/roundcube

    roundcube: tests - add space to db password, check setup script worked
    f--t authored Nov 19, 2019
    Copy the full SHA
    d7982b7 View commit details
  2. Copy the full SHA
    4c18309 View commit details

Commits on Nov 20, 2019

  1. Merge pull request #71407 from f--t/fix/roundcube

    roundcube: fix -- quoting string env variable
    globin authored Nov 20, 2019
    Copy the full SHA
    5f7bcff View commit details
Showing with 8 additions and 7 deletions.
  1. +1 −1 nixos/modules/services/mail/roundcube.nix
  2. +7 −6 nixos/tests/roundcube.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/mail/roundcube.nix
Original file line number Diff line number Diff line change
@@ -160,7 +160,7 @@ in
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create role ${cfg.database.username} with login password '${cfg.database.password}'";
${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "create database ${cfg.database.dbname} with owner ${cfg.database.username}";
fi
PGPASSWORD=${cfg.database.password} ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
PGPASSWORD="${cfg.database.password}" ${pkgs.postgresql}/bin/psql -U ${cfg.database.username} \
-f ${cfg.package}/SQL/postgres.initial.sql \
-h ${cfg.database.host} ${cfg.database.dbname}
touch /var/lib/roundcube/db-created
13 changes: 7 additions & 6 deletions nixos/tests/roundcube.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
services.roundcube = {
enable = true;
hostName = "roundcube";
database.password = "notproduction";
database.password = "not production";
package = pkgs.roundcube.withPlugins (plugins: [ plugins.persistent_login ]);
plugins = [ "persistent_login" ];
};
@@ -21,10 +21,11 @@ import ./make-test-python.nix ({ pkgs, ...} : {
};

testScript = ''
roundcube.start
roundcube.wait_for_unit("postgresql.service")
roundcube.wait_for_unit("phpfpm-roundcube.service")
roundcube.wait_for_unit("nginx.service")
roundcube.succeed("curl -sSL http://roundcube/ | grep 'Keep me logged in'")
$roundcube->start;
$roundcube->waitForUnit("postgresql.service");
$roundcube->waitForUnit("roundcube-setup.service");
$roundcube->waitForUnit("phpfpm-roundcube.service");
$roundcube->waitForUnit("nginx.service");
$roundcube->succeed("curl -sSfL http://roundcube/ | grep 'Keep me logged in'");
'';
})