Disroot-Ansible/prosody
10
0
Fork 0
Code Pull requests Projects Releases Activity

Merge branch 'staging' into contact_info

Browse source
This commit is contained in:
meaz 2024-07-17 17:56:32 +02:00
commit aabfc5b207
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
defaults/main.yml
View file

@ -28,7 +28,7 @@ firewall_users_blocked:
#PROSODY CONFIG #PROSODY CONFIG
prosody_allow_registration: 'false' prosody_allow_registration: 'false'
prosody_certificates: 'certs' prosody_certificate_path: '/etc/letsencrypt/live'
server_name: 'example.org' server_name: 'example.org'
prosody_c2s_encryption: 'true' prosody_c2s_encryption: 'true'
prosody_s2s_auth: 'false' prosody_s2s_auth: 'false'

4
templates/etc/prosody/conf.d/custom_component.cfg.lua.j2
View file

@ -11,7 +11,7 @@ Component "{{ item.name }}"
{% if item.ssl %} {% if item.ssl %}
-- SSL Settings -- SSL Settings
ssl = { ssl = {
key = "/etc/prosody/{{ prosody_certificates }}/{{ item.name }}/privkey.pem"; key = "{{ prosody_certificate_path }}/{{ item.name }}/privkey.pem";
certificate = "/etc/prosody/{{ prosody_certificates }}/{{ item.name }}/fullchain.pem"; certificate = "{{ prosody_certificate_path }}/{{ item.name }}/fullchain.pem";
} }
{% endif %} {% endif %}

4
templates/etc/prosody/conf.d/muc.cfg.lua.j2
View file

@ -29,8 +29,8 @@ modules_enabled = {
-- SSL Settings -- SSL Settings
ssl = { ssl = {
key = "/etc/prosody/{{ prosody_certificates }}/{{ item.url }}/privkey.pem"; key = "{{ prosody_certificate_path }}/{{ item.url }}/privkey.pem";
certificate = "/etc/prosody/{{ prosody_certificates }}/{{ item.url }}/fullchain.pem"; certificate = "{{ prosody_certificate_path }}/{{ item.url }}/fullchain.pem";
} }
{% endfor %} {% endfor %}
{% endif %} {% endif %}

4
templates/etc/prosody/conf.d/proxy65.cfg.lua.j2
View file

@ -7,6 +7,6 @@ Component "{{ prosody_proxy65_url }}" "proxy65"
-- SSL Settings -- SSL Settings
ssl = { ssl = {
key = "/etc/prosody/{{ prosody_certificates }}/{{ prosody_proxy65_url }}/privkey.pem"; key = "{{ prosody_certificate_path }}/{{ prosody_proxy65_url }}/privkey.pem";
certificate = "/etc/prosody/{{ prosody_certificates }}/{{ prosody_proxy65_url }}/fullchain.pem"; certificate = "{{ prosody_certificate_path }}/{{ prosody_proxy65_url }}/fullchain.pem";
} }

4
templates/etc/prosody/conf.d/pubsub.cfg.lua.j2
View file

@ -33,6 +33,6 @@ feed = {
-- SSL Settings -- SSL Settings
ssl = { ssl = {
key = "/etc/prosody/{{ prosody_certificates }}/{{ prosody_pubsub_url }}/privkey.pem"; key = "{{ prosody_certificate_path }}/{{ prosody_pubsub_url }}/privkey.pem";
certificate = "/etc/prosody/{{ prosody_certificates }}/{{ prosody_pubsub_url }}/fullchain.pem"; certificate = "{{ prosody_certificate_path }}/{{ prosody_pubsub_url }}/fullchain.pem";
} }