cb723da293
Merge pull request 'Merge staging to main' ( #31 ) from staging into main
...
Reviewed-on: #31
2024-08-01 06:16:22 +02:00
819b157611
Merge pull request 'small addition to readme (we need much better one btw); removed changelog; added requested change in PR #31 ' ( #32 ) from doc into staging
...
Reviewed-on: #32
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2024-07-31 09:59:26 +02:00
c6fc936ede
small addition to readme (we need much better one btw); removed changelog; added requested change in PR #31
2024-07-30 21:51:18 +02:00
e8d9418f25
Merge pull request 'Fix how contact info vars are set' ( #30 ) from contact_info into staging
...
Reviewed-on: #30
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2024-07-24 08:41:21 +02:00
28065f6664
fix typo
2024-07-19 07:37:22 +02:00
aabfc5b207
Merge branch 'staging' into contact_info
2024-07-17 17:56:32 +02:00
ee45d46f10
set contact, abuse and admins contact from main and set those in mod vars.
2024-07-16 21:26:51 +02:00
d9132eafc9
remove that part that is useless coz already defined at the end of the file
2024-07-16 21:25:31 +02:00
7715a12145
fix typos
2024-07-15 22:56:19 +02:00
44c966b3cd
remove apostrophes in contact addresses
2024-07-13 12:41:45 +02:00
62c957b8f3
Fix how contact info vars are set
2024-07-13 12:40:33 +02:00
2313ee4170
Merge pull request 'changed certificate path variable handling' ( #29 ) from cert_path into staging
...
Reviewed-on: #29
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2024-05-08 08:58:19 +02:00
8cdb244d88
changed certificate path variable handling
2024-05-08 01:34:54 +02:00
10ae1db100
Merge pull request 'add muc_reserve_nick_pattern' ( #28 ) from muc_reserve_nick_pattern into main
...
Reviewed-on: #28
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2023-05-16 19:16:21 +00:00
1aa1b1b506
add muc_reserve_nick_pattern
2023-05-06 10:42:34 +02:00
2233b0263f
Merge pull request 'Direct TLS port fix' ( #27 ) from directtls into main
...
Reviewed-on: #27
Reviewed-by: meaz <meaz@no-reply@disroot.org>
2023-02-21 19:23:24 +00:00
4c1fd3113e
changed default port for s2s direct tls; added interfaces variable to be able to define on which interfaces prosody should listen on
2023-02-18 05:59:13 +01:00
30a2b3a093
Merge pull request 'change include to include_tasks' ( #26 ) from include_tasks into main
...
Reviewed-on: #26
2023-01-19 07:07:37 +00:00
df035a9e17
change include to include_tasks
2023-01-09 07:08:50 +01:00
41e62b1685
add acl in vagrant file
2023-01-09 07:08:44 +01:00
be4c057eec
add s2s_bidi ( #23 )
...
see #9
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #23
2022-12-18 07:59:21 +00:00
b9277fac98
fix error with firewall ( #25 )
...
(just change name of the file)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #25
2022-12-18 07:57:24 +00:00
848f5e474e
Better match with latest developpement ( #24 )
...
A few things that needed to be fixed (errors that you can see with `prosodyctl check` on prod) + better match with `prosody.cfg.lua.dist` example from trunk
Co-authored-by: meaz <meaz@disroot.org>
Co-authored-by: muppeth <muppeth@disroot.org>
Reviewed-on: #24
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2022-09-06 19:37:21 +00:00
f0f9851a08
fix lower case incompability ( #21 )
...
Co-authored-by: antilopa <antilopa@disroot.org>
Reviewed-on: #21
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@no-reply@disroot.org>
Co-committed-by: antilopa <antilopa@no-reply@disroot.org>
2022-04-02 18:56:22 +00:00
6415acfaf5
Change from mod_http_upload to mod_http_file_share ( #19 )
...
see here: Disroot/Disroot-Project#203
As soon as we agree on this, I'll work on host_vars
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #19
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-02-26 20:58:49 +00:00
33fbf1149b
change direct_tls_ports to s2s_direct_tls_ports and c2s_direct_tls_ports ( #20 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #20
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-02-24 21:10:50 +00:00
6e764cd388
add option for siskin support ( #14 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #14
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-01-06 21:04:30 +00:00
908b0730c0
install lua-dbi according to the right DB used. ( #16 )
...
Fix #15
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #16
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2022-01-06 21:04:05 +00:00
6145d7dffb
add script to allow invitation from muc in firewall ( #13 )
...
Fix this [Disroot/Disroot-Project#151 (comment) )
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #13
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-11-03 10:45:54 +00:00
f1bd817f33
remove daemonize as it is deprecated ( #12 )
...
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #12
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-11-02 14:39:14 +00:00
79abba2826
implement XEP-0368: SRV records for XMPP over TLS ( #6 )
...
Partially implement this: [#112 ](Disroot/Disroot-Project#112 )
We need to add *xmpps-client.tcp* SRV records to our DNS for this port
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #6
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-07-29 08:32:20 +00:00
024248c20a
Merge pull request 'Add some stanza limits' ( #5 ) from security into master
...
Reviewed-on: #5
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
2021-05-21 08:37:05 +00:00
b1da8bc8fc
add mod_limits option
2021-05-13 19:28:54 +02:00
ab7575baa6
add stanza size limit vars
2021-05-13 19:28:40 +02:00
b2fbd643a9
Merge pull request 'Fix muc_ban_ip' ( #4 ) from muc_ban_ip into master
...
Reviewed-on: #4
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-05-11 20:12:43 +00:00
a941ca5097
Merge branch 'master' into muc_ban_ip
2021-05-11 21:58:17 +02:00
8add066396
fix muc_ban_ip mod
2021-05-11 21:54:30 +02:00
31100d9a07
add mod muc_ban_ip ( #3 )
...
See #1 (comment)
Co-authored-by: meaz <meaz@disroot.org>
Reviewed-on: #3
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Co-authored-by: meaz <meaz@no-reply@disroot.org>
Co-committed-by: meaz <meaz@no-reply@disroot.org>
2021-05-08 06:30:43 +00:00
ebb98ba773
update readme
2021-05-08 08:30:02 +02:00
5a2599bf6a
Merge branch 'master' into muc_ban_ip
2021-05-08 08:29:30 +02:00
a8a475d7df
Merge pull request 'Prosody - push compatibility with siskin' ( #2 ) from siskin into master
...
Reviewed-on: #2
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>
Reviewed-by: antilopa <antilopa@no-reply@disroot.org>
2021-05-08 06:26:41 +00:00
8fb6e35479
moved latest entry in changelog to the top
2021-05-07 08:16:52 +02:00
5ed6234133
complete changelog
2021-05-05 09:08:02 +02:00
81d77579f9
update changelog
2021-05-05 09:07:07 +02:00
1a7f8da071
add muc_ban_ip
2021-05-05 09:04:34 +02:00
d7a8ee20d5
push compatibility with siskin
2021-05-02 08:19:22 +02:00
ac32827f68
add lua-luaossl for siskin compatibility / mod_cloud_notify_encrypted
2021-05-02 08:07:41 +02:00
57d8dd472a
remove admin_blocklist defines twice
2021-05-02 08:07:09 +02:00
e432dedde4
Migration commit; fresh start
2021-03-14 11:00:16 +01:00
54b69b6008
Initial commit
2021-03-14 09:57:59 +00:00