summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2019-08-23 13:27:55 +0200
committerGitHub <noreply@github.com>2019-08-23 13:27:55 +0200
commit8b12bfcb8382ae99895da4e641a3728e4c29f6d4 (patch)
tree29e2c583af04bc76c342d7f25feb18e28ee81e2d /nixos
parentf8d260103717c6d10b95205f5bc77d493619b134 (diff)
parent9a0e820f5d317ee9438443745c567a1bb2bdb4cc (diff)
downloadnixpkgs-8b12bfcb8382ae99895da4e641a3728e4c29f6d4.tar
nixpkgs-8b12bfcb8382ae99895da4e641a3728e4c29f6d4.tar.gz
nixpkgs-8b12bfcb8382ae99895da4e641a3728e4c29f6d4.tar.bz2
nixpkgs-8b12bfcb8382ae99895da4e641a3728e4c29f6d4.tar.lz
nixpkgs-8b12bfcb8382ae99895da4e641a3728e4c29f6d4.tar.xz
nixpkgs-8b12bfcb8382ae99895da4e641a3728e4c29f6d4.tar.zst
nixpkgs-8b12bfcb8382ae99895da4e641a3728e4c29f6d4.zip
Merge pull request #66215 from ajs124/ejabberd/19.08
ejabberd: 19.05 -> 19.08
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/xmpp/ejabberd.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/tests/xmpp/ejabberd.nix b/nixos/tests/xmpp/ejabberd.nix
index 7eb566b5468..196a04aca30 100644
--- a/nixos/tests/xmpp/ejabberd.nix
+++ b/nixos/tests/xmpp/ejabberd.nix
@@ -45,8 +45,7 @@ import ../make-test.nix ({ pkgs, ... }: {
               ip: "127.0.0.1"
               module: ejabberd_service
               access: local
-              shaper_rule: fast
-              ip: "127.0.0.1"
+              shaper: fast
 
           ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text
           ## password storage (see auth_password_format option).
@@ -181,7 +180,6 @@ import ../make-test.nix ({ pkgs, ... }: {
             mod_client_state: {}
             mod_configure: {} # requires mod_adhoc
             ## mod_delegation: {} # for xep0356
-            mod_echo: {}
             #mod_irc:
             #  host: "irc.@HOST@"
             #  default_encoding: "utf-8"