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
base: d8845663d928
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4b87b6f51663
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 10, 2020

  1. ejabberd: fix failing tests 

    This commit fixes the ejabberd tests for hydra:

mod_http_upload and mod_disco need to be explicitly enabled, and a
handler needs to be setup to make it work. Also, the client needs to be
able to contact the server.

The commit also fixes the situation where http upload failed: in that
case the client would wait forever because nothing catched the error.

Finally, there remains a non-reproducible error where ejabberd server
fails to start with an error like:
format: "Failed to create cookie file '/var/lib/ejabberd/.erlang.cookie': eacces"
(happens ~15%) I tried to check existence of /var/lib/ejabberd/ in
pre-start script and saw nothing that would explain this error, so I
gave up about this error in particular.

(cherry picked from commit cdaec7e)
    @immae
    immae committed Sep 10, 2020
    Copy the full SHA
    1a8d8dd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #97648 from immae/fix_ejabberd 

    [20.09] ejabberd: fix failing tests
    @worldofpeace
    worldofpeace committed Sep 10, 2020
    Copy the full SHA
    4b87b6f View commit details
    Browse the repository at this point in the history