Commit graph

Select branches

Hide pull requests

cdomain

external_ip

main

staging

#11

#12

#13

#14

#16

#17

#19

#2

#20

#21

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#4

#5

#6

Mono Color

• 7601061e13 Merge pull request 'Add selfsigned certificate creation' (#37) from selfsigned into staging staging meaz 2025-03-02 15:33:31 +01:00
• 0ba3ba8e09
  
  readd ssl in bosh, though I'm pretty sure that can be removed! meaz 2025-02-21 15:10:02 +01:00
• a3f99da1f7
  
  remove extra breaklines! meaz 2025-02-21 14:59:16 +01:00
• bcb66706d1
  
  add selfsigned tasks meaz 2025-02-21 14:59:04 +01:00
• da5900bd54
  
  Add info in readme about selfsigned certificates meaz 2025-02-21 14:57:05 +01:00
• 7dc05a52a3
  
  add selfsigned task meaz 2025-02-21 14:33:13 +01:00
• e96dfec84a
  
  add selfsigned vars file meaz 2025-02-21 14:32:54 +01:00
• f1d605c08f
  
  remove unused var meaz 2025-02-21 14:31:51 +01:00
• 9828362fb3 Merge pull request 'fixed typo' (#36) from external_addresses into staging muppeth 2024-10-23 13:03:05 +02:00
• bf121d0aaa Merge branch 'staging' into external_addresses muppeth 2024-10-23 12:56:09 +02:00
• 543256bd77
  
  fixed typo muppeth 2024-10-23 12:55:36 +02:00
• fc2b42ea91 Merge pull request 'external_addresses' (#35) from external_addresses into staging muppeth 2024-10-23 12:46:05 +02:00
• d1019a8562
  
  added external ip address option muppeth 2024-10-23 12:45:06 +02:00
• af6ed82f46 Merge pull request 'Merging recent changes in staging into main' (#34) from staging into main main muppeth 2024-10-16 12:47:26 +02:00
• dc4bf1f96e Merge pull request 'Removed unused prosody_certificates and replaced it with prosody_certificate_path' (#33) from 971_prosody_cert_cleanup into staging muppeth 2024-08-01 20:50:47 +02:00
• 5dc13216e6
  
  Removed unused prosody_certificates and replaced it with prosody_certificate_path muppeth 2024-08-01 10:12:01 +02:00
• cb723da293 Merge pull request 'Merge staging to main' (#31) from staging into main muppeth 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 muppeth 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 muppeth 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 meaz 2024-07-24 08:41:21 +02:00
• 28065f6664
  
  fix typo meaz 2024-07-19 07:37:22 +02:00
• aabfc5b207 Merge branch 'staging' into contact_info meaz 2024-07-17 17:56:32 +02:00
• ee45d46f10
  
  set contact, abuse and admins contact from main and set those in mod vars. meaz 2024-07-16 21:26:51 +02:00
• d9132eafc9
  
  remove that part that is useless coz already defined at the end of the file meaz 2024-07-16 21:25:31 +02:00
• 7715a12145
  
  fix typos meaz 2024-07-15 22:56:19 +02:00
• 44c966b3cd
  
  remove apostrophes in contact addresses meaz 2024-07-13 12:41:45 +02:00
• 62c957b8f3
  
  Fix how contact info vars are set meaz 2024-07-13 12:40:33 +02:00
• 2313ee4170 Merge pull request 'changed certificate path variable handling' (#29) from cert_path into staging muppeth 2024-05-08 08:58:19 +02:00
• 8cdb244d88
  
  changed certificate path variable handling muppeth 2024-05-08 01:34:54 +02:00
• 58a33a88e6 external ip setting external_ip muppeth 2024-03-05 17:11:26 +01:00
• 10ae1db100 Merge pull request 'add muc_reserve_nick_pattern' (#28) from muc_reserve_nick_pattern into main meaz 2023-05-16 19:16:21 +00:00
• 1aa1b1b506
  
  add muc_reserve_nick_pattern meaz 2023-05-06 10:42:34 +02:00
• 2233b0263f Merge pull request 'Direct TLS port fix' (#27) from directtls into main muppeth 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 muppeth 2023-02-18 05:59:13 +01:00
• 30a2b3a093 Merge pull request 'change include to include_tasks' (#26) from include_tasks into main meaz 2023-01-19 07:07:37 +00:00
• df035a9e17
  
  change include to include_tasks meaz 2023-01-09 07:08:50 +01:00
• 41e62b1685
  
  add acl in vagrant file meaz 2023-01-09 07:08:44 +01:00
• 74239698b6
  
  Merge branch 'master' into cdomain cdomain meaz 2022-12-29 10:04:52 +01:00
• be4c057eec add s2s_bidi (#23) meaz 2022-12-18 07:59:21 +00:00
• 2ae5a8d914 Merge branch 'master' into s2s_bidi meaz 2022-12-18 07:58:52 +00:00
• b9277fac98 fix error with firewall (#25) meaz 2022-12-18 07:57:24 +00:00
• 82d936383c
  
  fix error with firewall meaz 2022-12-03 22:15:39 +01:00
• 68b4a3a92d Merge branch 'master' into s2s_bidi meaz 2022-09-18 06:33:36 +00:00
• 848f5e474e Better match with latest developpement (#24) meaz 2022-09-06 19:37:21 +00:00
• bae19cf270
  
  switched vagrant to debian11; fixed http related variables; fixed http-file-share muppeth 2022-09-05 23:23:43 +02:00
• 034ebc4ebb Merge branch 'master' into prosody_update meaz 2022-04-02 21:23:16 +00:00
• 7786680e48
  
  better match with latest change on prosody.cfg.lua.dist in trunk meaz 2022-04-02 23:20:54 +02:00
• 23e3aa4f1b
  
  deprecated option meaz 2022-04-02 22:01:38 +02:00
• e657f258ce
  
  remove obsolete options meaz 2022-04-02 21:57:48 +02:00
• f0f9851a08 fix lower case incompability (#21) antilopa 2022-04-02 18:56:22 +00:00
• 62814f2fa9
  
  add s2s_bidi meaz 2022-03-21 21:27:34 +01:00
• 86eeae719c fix lower case incompability antilopa 2022-03-01 22:30:35 +01:00
• 6415acfaf5 Change from mod_http_upload to mod_http_file_share (#19) meaz 2022-02-26 20:58:49 +00:00
• 06c89ca9d2 Merge branch 'master' into http_file_share meaz 2022-02-25 22:05:01 +00:00
• 33fbf1149b change direct_tls_ports to s2s_direct_tls_ports and c2s_direct_tls_ports (#20) meaz 2022-02-24 21:10:50 +00:00
• 8d3bedcc4e
  
  change direct_tls_ports to s2s_direct_tls_ports and c2s_direct_tls_ports meaz 2022-02-17 18:43:54 +01:00
• e55c45f847
  
  typo meaz 2022-01-22 17:55:26 +01:00
• e0db012105
  
  updage changelog meaz 2022-01-22 17:54:17 +01:00
• c62b34fc8a
  
  disable nodeinfo2 as it doesn't work with trunk anymore meaz 2022-01-22 17:51:15 +01:00
• 13dc4244b0
  
  fix missing double quote missing in firewall var meaz 2022-01-22 17:47:35 +01:00
• 1c1925c92c
  
  remove extra quote in lua var name meaz 2022-01-22 17:47:08 +01:00
• cbf04cd680
  
  add component name var meaz 2022-01-22 17:38:50 +01:00
• 421c71e9a0
  
  fix var name meaz 2022-01-22 17:33:51 +01:00
• 7b8f1ba403
  
  change var names in tasks for right template deployment meaz 2022-01-22 17:17:43 +01:00
• 90aa20eb44
  
  create http_file_share template and vars meaz 2022-01-22 17:16:32 +01:00
• 138e262bf2
  
  remove http_upload vars and templates meaz 2022-01-22 17:15:57 +01:00
• 54c8c5be22
  
  remove mod_http_upload meaz 2022-01-22 16:52:51 +01:00
• 895aaac511
  
  Merge branch 'cdomain' of https://git.disroot.org/Disroot-Ansible/prosody into cdomain meaz 2022-01-06 22:23:17 +01:00
• d5052c3e74
  
  custom domain additions and direct TLS port fix muppeth 2022-01-06 21:41:45 +01:00
• 22d516be14
  
  added direct tls port option and small addition for custom domain stuff muppeth 2022-01-05 23:08:39 +01:00
• 6e764cd388 add option for siskin support (#14) meaz 2022-01-06 21:04:30 +00:00
• 6a460b957c Merge branch 'master' into siskin2 meaz 2022-01-06 21:04:16 +00:00
• 908b0730c0 install lua-dbi according to the right DB used. (#16) meaz 2022-01-06 21:04:05 +00:00
• 2c5274267d
  
  custom domain additions and direct TLS port fix muppeth 2022-01-06 21:41:45 +01:00
• f1b9569548
  
  added direct tls port option and small addition for custom domain stuff muppeth 2022-01-05 23:08:39 +01:00
• dac306fe6d Merge branch 'master' into prosody_mod meaz 2021-12-28 10:25:46 +00:00
• 6f21cbe853
  
  install lua-dbi according to the right DB used. meaz 2021-12-24 07:33:51 +01:00
• 9c0309df22 Merge branch 'master' into siskin2 meaz 2021-12-02 16:12:28 +00:00
• 6145d7dffb add script to allow invitation from muc in firewall (#13) meaz 2021-11-03 10:45:54 +00:00
• ca1a18f909 Merge branch 'master' into invitation_firewall meaz 2021-11-02 14:39:24 +00:00
• f1bd817f33 remove daemonize as it is deprecated (#12) meaz 2021-11-02 14:39:14 +00:00
• d2ae716a4a
  
  add option for siskin support meaz 2021-10-17 10:46:53 +02:00
• cea093c5d8
  
  add script to allow invitation from muc in firewall meaz 2021-10-14 14:41:22 +02:00
• 417d6e9d2c
  
  remove daemonize as it is deprecated meaz 2021-08-08 07:45:56 +02:00
• fc3e34a07f
  
  more explicite options meaz 2021-07-30 09:27:10 +02:00
• bfe1a8abbc
  
  add 2 new mods meaz 2021-07-29 14:35:01 +02:00
• 79abba2826 implement XEP-0368: SRV records for XMPP over TLS (#6) meaz 2021-07-29 08:32:20 +00:00
• b63c07d423
  
  add missing option meaz 2021-07-28 15:22:45 +02:00
• 3155bd65fd
  
  change option name meaz 2021-07-28 15:22:31 +02:00
• cd7a60da65
  
  change option name for latest prosody meaz 2021-07-28 14:52:03 +02:00
• 1fbdd2a84e
  
  implement XEP-0368: SRV records for XMPP over TLS meaz 2021-07-26 12:24:24 +02:00
• 024248c20a Merge pull request 'Add some stanza limits' (#5) from security into master meaz 2021-05-21 08:37:05 +00:00
• b1da8bc8fc
  
  add mod_limits option meaz 2021-05-13 19:28:54 +02:00
• ab7575baa6
  
  add stanza size limit vars meaz 2021-05-13 19:28:40 +02:00
• b2fbd643a9 Merge pull request 'Fix muc_ban_ip' (#4) from muc_ban_ip into master meaz 2021-05-11 20:12:43 +00:00
• a941ca5097
  
  Merge branch 'master' into muc_ban_ip meaz 2021-05-11 21:58:17 +02:00
• 8add066396
  
  fix muc_ban_ip mod meaz 2021-05-11 21:54:30 +02:00
• 31100d9a07 add mod muc_ban_ip (#3) meaz 2021-05-08 06:30:43 +00:00
• ebb98ba773
  
  update readme meaz 2021-05-08 08:30:02 +02:00
• 5a2599bf6a
  
  Merge branch 'master' into muc_ban_ip meaz 2021-05-08 08:29:30 +02:00