👌 pottwal: Move prosody config to /etc
Configuration is not data. Suggested-by: Stefan Haun <tux@netz39.de>
This commit is contained in:
parent
1de850826f
commit
88e14f7ca6
2 changed files with 29 additions and 4 deletions
|
@ -125,10 +125,34 @@
|
||||||
msg: "prosody data dir is missing, please restore from the backup!"
|
msg: "prosody data dir is missing, please restore from the backup!"
|
||||||
when: not prosody_dir.stat.exists
|
when: not prosody_dir.stat.exists
|
||||||
|
|
||||||
|
- name: Ensure prosody config dir exists
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "{{ prosody_config_dir }}"
|
||||||
|
state: directory
|
||||||
|
mode: 0755
|
||||||
|
|
||||||
|
- name: Ensure prosody certs dir exists
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "{{ prosody_config_dir }}/certs"
|
||||||
|
state: directory
|
||||||
|
mode: 0750
|
||||||
|
|
||||||
|
- name: Ensure prosody conf.avail dir exists
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "{{ prosody_config_dir }}/conf.avail"
|
||||||
|
state: directory
|
||||||
|
mode: 0755
|
||||||
|
|
||||||
|
- name: Ensure prosody certs dir exists
|
||||||
|
ansible.builtin.file:
|
||||||
|
path: "{{ prosody_config_dir }}/conf.d"
|
||||||
|
state: directory
|
||||||
|
mode: 0755
|
||||||
|
|
||||||
- name: Ensure prosody main config file is in place
|
- name: Ensure prosody main config file is in place
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: "templates/prosody/prosody.cfg.lua.j2"
|
src: "templates/prosody/prosody.cfg.lua.j2"
|
||||||
dest: "{{ prosody_data_dir }}/etc/prosody/prosody.cfg.lua"
|
dest: "{{ prosody_config_dir }}/prosody.cfg.lua"
|
||||||
mode: 0644
|
mode: 0644
|
||||||
notify:
|
notify:
|
||||||
- Restart prosody
|
- Restart prosody
|
||||||
|
@ -136,7 +160,7 @@
|
||||||
- name: "Ensure prosody config file is in place: {{ prosody_domain_name }}"
|
- name: "Ensure prosody config file is in place: {{ prosody_domain_name }}"
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
src: "files/prosody/{{ prosody_domain_name }}.cfg.lua"
|
src: "files/prosody/{{ prosody_domain_name }}.cfg.lua"
|
||||||
dest: "{{ prosody_data_dir }}/etc/prosody/conf.avail/{{ prosody_domain_name }}.cfg.lua"
|
dest: "{{ prosody_config_dir }}/conf.avail/{{ prosody_domain_name }}.cfg.lua"
|
||||||
mode: 0644
|
mode: 0644
|
||||||
notify:
|
notify:
|
||||||
- Restart prosody
|
- Restart prosody
|
||||||
|
@ -144,7 +168,7 @@
|
||||||
- name: "Ensure prosody config symlink exists: {{ prosody_domain_name }}"
|
- name: "Ensure prosody config symlink exists: {{ prosody_domain_name }}"
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
src: "../conf.avail/{{ prosody_domain_name }}.cfg.lua"
|
src: "../conf.avail/{{ prosody_domain_name }}.cfg.lua"
|
||||||
dest: "{{ prosody_data_dir }}/etc/prosody/conf.d/{{ prosody_domain_name }}.cfg.lua"
|
dest: "{{ prosody_config_dir }}/conf.d/{{ prosody_domain_name }}.cfg.lua"
|
||||||
state: link
|
state: link
|
||||||
notify:
|
notify:
|
||||||
- Restart prosody
|
- Restart prosody
|
||||||
|
@ -162,7 +186,7 @@
|
||||||
- 5222:5222 # xmpp-client
|
- 5222:5222 # xmpp-client
|
||||||
- 5269:5269 # xmpp-server
|
- 5269:5269 # xmpp-server
|
||||||
volumes:
|
volumes:
|
||||||
- "{{ prosody_data_dir }}/etc/prosody:/etc/prosody:rw"
|
- "{{ prosody_config_dir }}:/etc/prosody:rw"
|
||||||
- "{{ prosody_data_dir }}/var/lib/prosody:/var/lib/prosody:rw"
|
- "{{ prosody_data_dir }}/var/lib/prosody:/var/lib/prosody:rw"
|
||||||
- "{{ prosody_data_dir }}/var/log/prosody:/var/log/prosody:rw"
|
- "{{ prosody_data_dir }}/var/log/prosody:/var/log/prosody:rw"
|
||||||
- "{{ dehydrated_certs_dir }}/{{ prosody_domain_name }}:/var/lib/dehydrated/certs/{{ prosody_domain_name }}:ro"
|
- "{{ dehydrated_certs_dir }}/{{ prosody_domain_name }}:/var/lib/dehydrated/certs/{{ prosody_domain_name }}:ro"
|
||||||
|
|
|
@ -31,6 +31,7 @@ influxdb_init_password: "{{ vault_influxdb_init_password }}"
|
||||||
|
|
||||||
gitea_host_port: 9091
|
gitea_host_port: 9091
|
||||||
|
|
||||||
|
prosody_config_dir: "/etc/prosody"
|
||||||
prosody_data_dir: "{{ data_dir }}/prosody"
|
prosody_data_dir: "{{ data_dir }}/prosody"
|
||||||
prosody_domain_name: jabber.n39.eu
|
prosody_domain_name: jabber.n39.eu
|
||||||
jabber_host_port: 8086
|
jabber_host_port: 8086
|
||||||
|
|
Loading…
Reference in a new issue