Update to 2020-06-23 18:00

master
Daniel Berteaud 4 years ago
parent a6a8d964d3
commit 0a0bbbdb2b
  1. 4
      roles/matrix_riot/defaults/main.yml
  2. 2
      roles/matrix_riot/tasks/archive_post.yml
  3. 2
      roles/matrix_riot/tasks/archive_pre.yml
  4. 2
      roles/matrix_riot/tasks/cleanup.yml
  5. 6
      roles/matrix_riot/tasks/conf.yml
  6. 2
      roles/matrix_riot/tasks/directories.yml
  7. 6
      roles/matrix_riot/tasks/facts.yml
  8. 6
      roles/matrix_riot/tasks/install.yml
  9. 2
      roles/matrix_riot/tasks/write_version.yml

@ -5,9 +5,9 @@
riot_id: riot riot_id: riot
# Version to deploy, and expected sha1 # Version to deploy, and expected sha1
riot_version: 1.6.5 riot_version: 1.6.6
# sha1sum of the tar.gz # sha1sum of the tar.gz
riot_archive_sha1: 62b238189384c8f34f37b8008df5ab3005cd545d riot_archive_sha1: aeccabd61e9244ac78752c4e1ce748c302337817
# Where to install riot # Where to install riot
riot_root_dir: /opt/matrix/riot riot_root_dir: /opt/matrix/riot

@ -5,5 +5,5 @@
- root_dir: "{{ riot_root_dir }}" - root_dir: "{{ riot_root_dir }}"
- version: "{{ riot_current_version }}" - version: "{{ riot_current_version }}"
when: riot_install_mode == 'upgrade' when: riot_install_mode == 'upgrade'
tags: riot tags: matrix

@ -4,4 +4,4 @@
vars: vars:
- root_dir: "{{ riot_root_dir }}" - root_dir: "{{ riot_root_dir }}"
- version: "{{ riot_current_version }}" - version: "{{ riot_current_version }}"
tags: riot tags: matrix

@ -5,4 +5,4 @@
with_items: with_items:
- riot-v{{ riot_version }}.tar.gz - riot-v{{ riot_version }}.tar.gz
- riot-v{{ riot_version }} - riot-v{{ riot_version }}
tags: riot tags: matrix

@ -2,14 +2,14 @@
- name: Remove sample config file - name: Remove sample config file
file: path={{ riot_root_dir }}/web/config.sample.json state=absent file: path={{ riot_root_dir }}/web/config.sample.json state=absent
tags: riot tags: matrix
- name: Deploy configuration - name: Deploy configuration
template: src=config.json.j2 dest={{ riot_root_dir }}/web/config.json template: src=config.json.j2 dest={{ riot_root_dir }}/web/config.json
tags: riot tags: matrix
- name: Deploy httpd configuration - name: Deploy httpd configuration
template: src=httpd.conf.j2 dest=/etc/httpd/ansible_conf.d/10-riot_{{ riot_id }}.conf template: src=httpd.conf.j2 dest=/etc/httpd/ansible_conf.d/10-riot_{{ riot_id }}.conf
notify: reload httpd notify: reload httpd
tags: riot tags: matrix

@ -8,4 +8,4 @@
mode: 700 mode: 700
- dir: meta - dir: meta
mode: 700 mode: 700
tags: riot tags: matrix

@ -4,9 +4,9 @@
vars: vars:
- root_dir: "{{ riot_root_dir }}" - root_dir: "{{ riot_root_dir }}"
- version: "{{ riot_version }}" - version: "{{ riot_version }}"
tags: riot tags: matrix
- set_fact: riot_install_mode={{ (install_mode == 'upgrade' and not riot_manage_upgrade) | ternary('none',install_mode) }} - set_fact: riot_install_mode={{ (install_mode == 'upgrade' and not riot_manage_upgrade) | ternary('none',install_mode) }}
tags: riot tags: matrix
- set_fact: riot_current_version={{ current_version | default('') }} - set_fact: riot_current_version={{ current_version | default('') }}
tags: riot tags: matrix

@ -6,7 +6,7 @@
dest: "{{ riot_root_dir }}/tmp/" dest: "{{ riot_root_dir }}/tmp/"
checksum: "sha1:{{ riot_archive_sha1 }}" checksum: "sha1:{{ riot_archive_sha1 }}"
when: riot_install_mode != 'none' when: riot_install_mode != 'none'
tags: riot tags: matrix
- name: Extract riot archive - name: Extract riot archive
unarchive: unarchive:
@ -14,7 +14,7 @@
dest: "{{ riot_root_dir }}/tmp/" dest: "{{ riot_root_dir }}/tmp/"
remote_src: True remote_src: True
when: riot_install_mode != 'none' when: riot_install_mode != 'none'
tags: riot tags: matrix
- name: Move the content of riot to the correct top directory - name: Move the content of riot to the correct top directory
synchronize: synchronize:
@ -24,5 +24,5 @@
delete: True delete: True
delegate_to: "{{ inventory_hostname }}" delegate_to: "{{ inventory_hostname }}"
when: riot_install_mode != 'none' when: riot_install_mode != 'none'
tags: riot tags: matrix

@ -4,4 +4,4 @@
vars: vars:
- root_dir: "{{ riot_root_dir }}" - root_dir: "{{ riot_root_dir }}"
- version: "{{ riot_version }}" - version: "{{ riot_version }}"
tags: riot tags: matrix

Loading…
Cancel
Save