aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-06-02 19:43:50 +0200
committerKim Alvefur <zash@zash.se>2020-06-02 19:43:50 +0200
commit6b98a3f55143f5be0b22ff5ce83999363cd5e253 (patch)
tree0820d643909561e7487c7c6ace1c6e27a5b24a56
parent753836c876d5060cbc7e0c2029597abaae844eed (diff)
downloadprosody-6b98a3f55143f5be0b22ff5ce83999363cd5e253.tar.gz
prosody-6b98a3f55143f5be0b22ff5ce83999363cd5e253.zip
mod_s2s: Move out of empty directory
mod_s2s.lua had been all alone in there since the removal of s2sout.lib.lua in 756b8821007a
-rw-r--r--GNUmakefile3
-rw-r--r--plugins/mod_s2s.lua (renamed from plugins/mod_s2s/mod_s2s.lua)0
2 files changed, 1 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 15362f5c..950690e6 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -49,9 +49,8 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin
$(INSTALL_DATA) util/*.so $(SOURCE)/util
$(MKDIR) $(SOURCE)/util/sasl
$(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl
- $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
+ $(MKDIR) $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(MODULES)/mod_mam
$(INSTALL_DATA) plugins/*.lua $(MODULES)
- $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s
$(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub
$(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc
$(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s.lua
index 0674f981..0674f981 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s.lua