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: 9b54c30474db
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dd38a549f84b
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 3, 2020

  1. nixos/prosody: add MUC extraConfig, fix extraConfig order

    Add extraConfig option for the muc submodule.
    
    Also move the global extraConfig before all components and
    virtualhosts, because the manual states:
    
        The configuration is divided into two parts. The first part is known as
        the "global" section. All settings here apply to the whole server, and
        are the default for all virtual hosts.
    
        The second half of the file is a series of VirtualHost and Component
        definitions. Settings under each VirtualHost or Component line apply
        only to that host.
    
    Before, if at least one muc was defined, or uploadHttp enabled, the
    global extraConfig would end up after "muc" or "http_upload" component
    making it apply to that component only and not globally.
    mmilata committed May 3, 2020
    Copy the full SHA
    ce0c39b View commit details
    Browse the repository at this point in the history
  2. nixosTests.prosodyMysql: fix

    Since 8aea528 xmpp-sendmessage.nix tests MUC and HTTP upload,
    change the test to reflect this.
    mmilata committed May 3, 2020
    Copy the full SHA
    96146a9 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. Merge pull request #86649 from mmilata/prosody-muc-extraconfig

    nixos/prosody: add MUC extraConfig + fixes
    flokli committed May 4, 2020
    Copy the full SHA
    dd38a54 View commit details
    Browse the repository at this point in the history