Update to 2020-06-23 18:00

5 years ago · 0a0bbbdb2b
parent a6a8d964d3
commit 0a0bbbdb2b
9 changed files with 16 additions and 16 deletions
--- a/roles/matrix_riot/defaults/main.yml
+++ b/roles/matrix_riot/defaults/main.yml
@ -5,9 +5,9 @@
 riot_id: riot

 # Version to deploy, and expected sha1
-riot_version: 1.6.5
+riot_version: 1.6.6
 # sha1sum of the tar.gz
-riot_archive_sha1: 62b238189384c8f34f37b8008df5ab3005cd545d
+riot_archive_sha1: aeccabd61e9244ac78752c4e1ce748c302337817

 # Where to install riot
 riot_root_dir: /opt/matrix/riot
--- a/roles/matrix_riot/tasks/archive_post.yml
+++ b/roles/matrix_riot/tasks/archive_post.yml
@ -5,5 +5,5 @@
    - root_dir: "{{ riot_root_dir }}"
    - version: "{{ riot_current_version }}"
  when: riot_install_mode == 'upgrade'
-  tags: riot
+  tags: matrix

--- a/roles/matrix_riot/tasks/archive_pre.yml
+++ b/roles/matrix_riot/tasks/archive_pre.yml
@ -4,4 +4,4 @@
  vars:
    - root_dir: "{{ riot_root_dir }}"
    - version: "{{ riot_current_version }}"
-  tags: riot
+  tags: matrix
--- a/roles/matrix_riot/tasks/cleanup.yml
+++ b/roles/matrix_riot/tasks/cleanup.yml
@ -5,4 +5,4 @@
  with_items:
    - riot-v{{ riot_version }}.tar.gz
    - riot-v{{ riot_version }}
-  tags: riot
+  tags: matrix
--- a/roles/matrix_riot/tasks/conf.yml
+++ b/roles/matrix_riot/tasks/conf.yml
@ -2,14 +2,14 @@

 - name: Remove sample config file
  file: path={{ riot_root_dir }}/web/config.sample.json state=absent
-  tags: riot
+  tags: matrix

 - name: Deploy configuration
  template: src=config.json.j2 dest={{ riot_root_dir }}/web/config.json
-  tags: riot
+  tags: matrix

 - name: Deploy httpd configuration
  template: src=httpd.conf.j2 dest=/etc/httpd/ansible_conf.d/10-riot_{{ riot_id }}.conf
  notify: reload httpd
-  tags: riot
+  tags: matrix

--- a/roles/matrix_riot/tasks/directories.yml
+++ b/roles/matrix_riot/tasks/directories.yml
@ -8,4 +8,4 @@
      mode: 700
    - dir: meta
      mode: 700
-  tags: riot
+  tags: matrix
--- a/roles/matrix_riot/tasks/facts.yml
+++ b/roles/matrix_riot/tasks/facts.yml
@ -4,9 +4,9 @@
  vars:
    - root_dir: "{{ riot_root_dir }}"
    - version: "{{ riot_version }}"
-  tags: riot
+  tags: matrix
 - 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('') }}
-  tags: riot
+  tags: matrix

--- a/roles/matrix_riot/tasks/install.yml
+++ b/roles/matrix_riot/tasks/install.yml
@ -6,7 +6,7 @@
    dest: "{{ riot_root_dir }}/tmp/"
    checksum: "sha1:{{ riot_archive_sha1 }}"
  when: riot_install_mode != 'none'
-  tags: riot
+  tags: matrix

 - name: Extract riot archive
  unarchive:
@ -14,7 +14,7 @@
    dest: "{{ riot_root_dir }}/tmp/"
    remote_src: True
  when: riot_install_mode != 'none'
-  tags: riot
+  tags: matrix

 - name: Move the content of riot to the correct top directory
  synchronize:
@ -24,5 +24,5 @@
    delete: True
  delegate_to: "{{ inventory_hostname }}"
  when: riot_install_mode != 'none'
-  tags: riot
+  tags: matrix

--- a/roles/matrix_riot/tasks/write_version.yml
+++ b/roles/matrix_riot/tasks/write_version.yml
@ -4,4 +4,4 @@
  vars:
    - root_dir: "{{ riot_root_dir }}"
    - version: "{{ riot_version }}"
-  tags: riot
+  tags: matrix