Browse Source

roles/riot-web: bump to 1.7.15, add tags

python3
Zolfa 4 years ago
parent
commit
6c9e2fb272
Signed by: zolfa GPG Key ID: E1A43B038C4D6616
3 changed files with 59 additions and 55 deletions
  1. +2
    -2
      roles/riot-web/defaults/main.yaml
  2. +2
    -53
      roles/riot-web/tasks/main.yaml
  3. +55
    -0
      roles/riot-web/tasks/riot-web.yaml

+ 2
- 2
roles/riot-web/defaults/main.yaml View File

@ -1,6 +1,6 @@
# Based on https://github.com/vector-im/riot-web/releases
# Based on https://github.com/vector-im/element-web/releases
--- ---
riot_web_version: "v1.6.8"
riot_web_version: "v1.7.15"
riot_web_nginx_fqdn: "riot.{{ domain }}" riot_web_nginx_fqdn: "riot.{{ domain }}"
synapse_nginx_fqdn: "matrix.{{ domain }}" synapse_nginx_fqdn: "matrix.{{ domain }}"
synapse_domain: "{{ domain }}" synapse_domain: "{{ domain }}"

+ 2
- 53
roles/riot-web/tasks/main.yaml View File

@ -1,56 +1,5 @@
--- ---
- name: 'create riot-web folder'
file:
path: '/srv/riot-web'
state: 'directory'
mode: '0755'
owner: 'www-data'
group: 'www-data'
- import_tasks: 'riot-web.yaml'
tags: tags:
- 'packages'
- name: 'download riot-web'
unarchive:
src: "https://github.com/vector-im/riot-web/releases/download/\
{{ riot_web_version }}/riot-{{ riot_web_version }}.tar.gz"
dest: '/srv/riot-web'
remote_src: true
owner: 'www-data'
group: 'www-data'
tags:
- 'packages'
- name: 'configure nginx location'
template:
src: 'riot.conf'
dest: '/etc/nginx/locations/{{ riot_web_nginx_fqdn }}/riot.conf'
notify:
- 'reload nginx'
- name: 'configure riot web'
template:
src: 'config.json.j2'
dest: '/srv/riot-web/riot-{{ riot_web_version }}/config.json'
- name: 'MONITORING | add HTTP service'
block:
- name: 'MONITORING | add service to monitoring entry'
set_fact:
monitoring_entry: >
{{ monitoring_entry | default({}) | combine({
'address': ansible_host,
'vhosts_uri': { riot_web_nginx_fqdn: {'/': '<title>Riot</title>'} },
}, recursive=true) }}
- name: 'MONITORING | update monitoring facts'
set_fact:
monitoring_facts: >
{{ hostvars[monitoring_host]['monitoring_facts']
| default({})
| combine({host_fqdn: monitoring_entry}) }}
delegate_facts: true
delegate_to: '{{ monitoring_host }}'
tags:
- 'monitoring'
...
- 'role::riot-web'
... ...

+ 55
- 0
roles/riot-web/tasks/riot-web.yaml View File

@ -0,0 +1,55 @@
---
- name: 'create riot-web folder'
file:
path: '/srv/riot-web'
state: 'directory'
mode: '0755'
owner: 'www-data'
group: 'www-data'
tags:
- 'packages'
- name: 'download riot-web'
unarchive:
src: "https://github.com/vector-im/element-web/releases/download/\
{{ riot_web_version }}/element-{{ riot_web_version }}.tar.gz"
dest: '/srv/riot-web'
remote_src: true
owner: 'www-data'
group: 'www-data'
tags:
- 'packages'
- name: 'configure nginx location'
template:
src: 'riot.conf'
dest: '/etc/nginx/locations/{{ riot_web_nginx_fqdn }}/riot.conf'
notify:
- 'reload nginx'
- name: 'configure riot web'
template:
src: 'config.json.j2'
dest: '/srv/riot-web/riot-{{ riot_web_version }}/config.json'
- name: 'MONITORING | add HTTP service'
block:
- name: 'MONITORING | add service to monitoring entry'
set_fact:
monitoring_entry: >
{{ monitoring_entry | default({}) | combine({
'address': ansible_host,
'vhosts_uri': { riot_web_nginx_fqdn: {'/': '<title>Riot</title>'} },
}, recursive=true) }}
- name: 'MONITORING | update monitoring facts'
set_fact:
monitoring_facts: >
{{ hostvars[monitoring_host]['monitoring_facts']
| default({})
| combine({host_fqdn: monitoring_entry}) }}
delegate_facts: true
delegate_to: '{{ monitoring_host }}'
tags:
- 'monitoring'
...

Loading…
Cancel
Save