Christophe Romain
1daa7ef785
Sync mix and rebar for eimp dep
2018-01-16 11:45:29 +01:00
Evgeniy Khramtsov
7b0fa7e6e2
Improve validation of 'convert' option
2018-01-16 01:06:20 +03:00
Christophe Romain
8bdccc25ab
Include acme deps in release, fixes f2c3fe8ac
2018-01-15 22:21:24 +01:00
Paweł Chmielowski
59b7c89944
Use correct name of new rebar command
2018-01-15 15:21:04 +01:00
Paweł Chmielowski
a7639fd4ad
Call configure on deps in separate rebar command that compile
...
This way we rebar.config.script can use vars detected by configure
2018-01-15 12:31:47 +01:00
Paweł Chmielowski
99f8e58eaf
Use override syntax that rebar3 accepts
2018-01-15 11:56:20 +01:00
Evgeniy Khramtsov
d3aab2ea18
Get rid of a call to misc:have_eimp()
2018-01-15 13:14:51 +03:00
Evgeniy Khramtsov
b970c88941
Merge branch 'master' of github.com:processone/ejabberd
2018-01-15 13:00:19 +03:00
Evgeniy Khramtsov
0f86559d83
Always build eimp dependency
...
Even if no suitable C graphics libraries are detected
at compile time, the package is still usable because it
provides `eimp:get_type/1` which is used by mod_avatar.
2018-01-15 12:54:57 +03:00
Paweł Chmielowski
be592c9272
Don't report errors when trying to remove not existing files in make install
2018-01-15 10:38:36 +01:00
Paweł Chmielowski
3df78d3a8f
Copy sh_to_ask function from xmerl_regexp.erl
...
This way we don't need to include xmerl application in our docker container
2018-01-15 10:31:26 +01:00
Evgeny Khramtsov
d2427c98c3
Merge pull request #2221 from licaon-kter/patch-1
...
Fix example config macro names
2018-01-14 09:54:22 +03:00
Licaon_Kter
84819ba0fe
Fix example config macro names
...
These were missed in c26b56679e (diff-19e0c10699732f76181f70cfbec95d38)
2018-01-13 21:38:01 +00:00
Evgeniy Khramtsov
f66a004821
Improve logging of failed s2s EXTERNAL authentication
2018-01-13 13:01:40 +03:00
Paweł Chmielowski
e1da673502
Fix detection of rebar3
...
Looks like sometimes rebar3 report version that can't be split to 3 fields
by '.', we need only first one so don't match the rest
2018-01-12 17:12:46 +01:00
Paweł Chmielowski
7d58b7a100
Improve resolving of system deps
...
This version is able to search for know alternative names of deps and
helps with running tests when using system deps
2018-01-12 16:16:12 +01:00
Christophe Romain
f2c3fe8ac6
Add mix dependencies for acme support
2018-01-12 12:28:31 +01:00
Evgeniy Khramtsov
1c1b12fc64
Note about direct-tls connections in example config
2018-01-12 10:27:33 +03:00
Paweł Chmielowski
1825cfaf05
Include newly releases fast_tls/esip/stun in mix.lock
2018-01-11 14:38:54 +01:00
Paweł Chmielowski
b8319c6617
Update mix.lock
2018-01-11 11:20:07 +01:00
Paweł Chmielowski
9e3a000748
Update deps
2018-01-11 11:11:56 +01:00
Christophe Romain
d6e1bc242c
Remove old docker specs
2018-01-11 10:19:56 +01:00
Christophe Romain
465629d458
Prepare mix for 18.01
2018-01-10 23:06:06 +01:00
Christophe Romain
7875cac786
Update mix deps
2018-01-10 18:14:52 +01:00
Paweł Chmielowski
d0bfcbbfd8
Handle error case from code:lib_dir in ResolveDepPath in rebar.config.script
2018-01-10 16:34:16 +01:00
Christophe Romain
88e6f1c6aa
Update mix deps
2018-01-10 12:07:19 +01:00
Paweł Chmielowski
cea5f14e88
Update deps again
2018-01-10 11:55:34 +01:00
Christophe Romain
8641c6cb34
Update mix deps
2018-01-10 11:48:53 +01:00
Paweł Chmielowski
e04b4c52fd
Update deps
2018-01-10 11:32:11 +01:00
Christophe Romain
1fac3e58b3
Fix indentation in commented example
2018-01-10 11:24:09 +01:00
Christophe Romain
f914c61f42
Report fs not suported on SunOS ( #2204 )
2018-01-10 10:58:47 +01:00
Paweł Chmielowski
df8888ab38
Send privileges if at least one of them is set, don't require all to be set
2018-01-09 15:50:42 +01:00
Mickaël Rémond
8a05c4ee27
Create CODE_OF_CONDUCT.md
2018-01-09 14:17:55 +01:00
Evgeniy Khramtsov
e822ce3554
Merge branch 'master' of github.com:processone/ejabberd
2018-01-08 13:45:21 +03:00
Evgeniy Khramtsov
aa9f2e5b88
Ignore result of sending stream trailer in test suite
2018-01-08 13:45:08 +03:00
Paweł Chmielowski
c5a4f67935
Delete old .so and executable files before installing new one
...
This fixes crash for people who have live ejabberd installed in make install
target directory, by ensuring that loaded binaries aren't replaced in memory
with new content.
2018-01-08 11:11:50 +01:00
Paweł Chmielowski
2b0cc2ddb4
Make all install target rules as .PHONY
2018-01-08 11:11:50 +01:00
Paweł Chmielowski
3f8eff27fa
Refactor code for installing binaries
2018-01-08 11:11:50 +01:00
Evgeniy Khramtsov
9d94361466
Process 'name' option for all route-registering modules
...
The option allows to set arbitrary text for disco#info identity name.
Previously, option 'name' was supported by mod_proxy65 and mod_http_upload
only. Now, all the following modules support this option as well:
- mod_disco
- mod_irc
- mod_muc
- mod_multicast
- mod_pubsub
- mod_vcard
Example:
```
modules:
...
mod_disco:
name: "Cool XMPP Server"
...
```
2018-01-08 11:29:17 +03:00
Evgeniy Khramtsov
150f33b39b
Update copyright dates in header files
2018-01-06 14:01:45 +03:00
Evgeniy Khramtsov
2d23dfccfd
Don't display copyright dates in vCards of services
...
Copyright dates in vCards may paritally disclose server version,
which is not always desired
2018-01-06 13:55:24 +03:00
Evgeniy Khramtsov
ee23b688a7
Use TLS defaults from fast_tls
2018-01-06 13:46:02 +03:00
Evgeniy Khramtsov
cdc7c1d1ed
Update copyright dates
2018-01-05 23:18:58 +03:00
Evgeniy Khramtsov
da2353d996
Refer to new fast_tls version
2018-01-05 17:56:32 +03:00
Evgeniy Khramtsov
fb07c9929a
Return true or false from send() callback
...
Fixes #2209
2018-01-05 12:15:28 +03:00
Evgeny Khramtsov
946754536c
Merge pull request #2202 from weiss/bounce-to-stranger
...
mod_block_strangers: Bounce an error message
2018-01-05 11:43:18 +03:00
Paweł Chmielowski
4c799528c7
Fix ejabberd command privacy_set
...
This fixes issue #2205
2018-01-04 14:57:36 +01:00
Holger Weiss
dbbe3a9e62
Merge remote-tracking branch 'processone/pr/2203'
...
* processone/pr/2203:
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:33:18 +01:00
Marc Schink
264add87fa
mod_proxy65: Expand @HOST@ keyword in 'hostname' option
2018-01-03 22:31:06 +01:00
Holger Weiss
835360733b
mod_block_strangers: Bounce an error message
...
Return a stanza error when a message is rejected, in order to make
legitimate users aware of the issue.
Closes #2197 .
2018-01-03 15:41:30 +01:00
