Update to 2020-04-29 13:00

master
Daniel Berteaud 5 years ago
parent 2bb7a7c0eb
commit 26b7807430
  1. 2
      roles/bitwarden_rs/meta/main.yml
  2. 2
      roles/jitsi_videobridge/tasks/cleanup.yml
  3. 5
      roles/mysql_server/defaults/main.yml
  4. 9
      roles/mysql_server/tasks/main.yml
  5. 6
      roles/repo_mariadb/defaults/main.yml
  6. 11
      roles/repo_mariadb/tasks/main.yml

@ -3,5 +3,7 @@
dependencies: dependencies:
- role: rust - role: rust
- role: nginx - role: nginx
- role: repo_mariadb
when: bitwarden_db_engine == 'mysql'
- role: mysql_server - role: mysql_server
when: bitwarden_db_engine == 'mysql' and (bitwarden_db_server == 'localhost' or bitwarden_db_server == '127.0.0.1') when: bitwarden_db_engine == 'mysql' and (bitwarden_db_server == 'localhost' or bitwarden_db_server == '127.0.0.1')

@ -4,5 +4,5 @@
file: path={{ item }} state=absent file: path={{ item }} state=absent
loop: loop:
- "{{ jitsi_root_dir }}/tmp/jitsi-videobridge-2.1-SNAPSHOT" - "{{ jitsi_root_dir }}/tmp/jitsi-videobridge-2.1-SNAPSHOT"
- "{{ jitsi_root_dir }}/src/jitsi-videobridge/target" - "{{ jitsi_root_dir }}/src/videobridge/target"
tags: jitsi tags: jitsi

@ -22,11 +22,6 @@ mysql_sql_mode: []
mysql_databases: [] mysql_databases: []
mysql_users: [] mysql_users: []
# If you need newer MariaDB version, define the branch here
# It'll use the yum repo from mariadb.org
mysql_mariadb_version: default
# mysql_mariadb_version: 10.3
# Databases and users to remove # Databases and users to remove
# Eg: # Eg:
# mysql_databases_to_remove: # mysql_databases_to_remove:

@ -1,14 +1,5 @@
--- ---
- name: Configure MariaDB repository
yum_repository:
name: mariadb
description: MariaDB
baseurl: http://yum.mariadb.org/{{ mysql_mariadb_version }}/centos7-amd64
gpgcheck: True
gpgkey: https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
state: "{{ (mysql_mariadb_version != 'default') | ternary('present','absent') }}"
- name: Install MariaDB server and client - name: Install MariaDB server and client
yum: yum:
name: name:

@ -0,0 +1,6 @@
---
# If you need newer MariaDB version, define the branch here
# It'll use the yum repo from mariadb.org
mysql_mariadb_version: default
# mysql_mariadb_version: 10.3

@ -0,0 +1,11 @@
---
- name: Configure MariaDB repository
yum_repository:
name: mariadb
description: MariaDB
baseurl: http://yum.mariadb.org/{{ mysql_mariadb_version }}/centos$releasever-amd64
gpgcheck: True
gpgkey: https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
state: "{{ (mysql_mariadb_version != 'default') | ternary('present','absent') }}"
tags: repo,mysql
Loading…
Cancel
Save