Unverified Commit 46bcc66f authored by Aaron Andersen's avatar Aaron Andersen Committed by GitHub
Browse files

Merge pull request #300805 from felixsinger/pkgs/redmine/fix-assertion 

nixos/redmine: Fix broken assertion when SQLite is used
parents 3c2fdd0a 7245e78e

nixos/modules/services/misc/redmine.nix

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ in 
      { assertion = pgsqlLocal -> cfg.database.user == cfg.database.name;

        message = "services.redmine.database.user and services.redmine.database.name must be the same when using a local postgresql database";

      }

      { assertion = cfg.database.createLocally -> cfg.database.type != "sqlite3" && cfg.database.socket != null;

        message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true";

      { assertion = (cfg.database.createLocally && cfg.database.type != "sqlite3") -> cfg.database.socket != null;

        message = "services.redmine.database.socket must be set if services.redmine.database.createLocally is set to true and no sqlite database is used";

      }

      { assertion = cfg.database.createLocally -> cfg.database.host == "localhost";

        message = "services.redmine.database.host must be set to localhost if services.redmine.database.createLocally is set to true";

nixos/tests/redmine.nix

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ let 
    meta.maintainers = [ maintainers.aanderse ];

  };

in {

  sqlite3 = redmineTest { name = "sqlite3"; type = "sqlite3"; };

  mysql = redmineTest { name = "mysql"; type = "mysql2"; };

  pgsql = redmineTest { name = "pgsql"; type = "postgresql"; };

}